diff --git a/projects/mtg/Makefile.1xx b/projects/mtg/Makefile.1xx index db2eb6560..18aade66f 100644 --- a/projects/mtg/Makefile.1xx +++ b/projects/mtg/Makefile.1xx @@ -1,5 +1,5 @@ TARGET = temp -OBJS = src/ActionElement.o src/ActionLayer.o src/AIPlaer.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/ConstraintResolver.o src/Damage.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameStateDuel.o src/GroupOfCards.o src/GuiCardsController.o src/GuiLayers.o src/ManaCost.o src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/Player.o src/SimpleMenuItem.o src/ActionStack.o src/Subtypes.o src/TargetChooser.o src/TexturesCache.o src/utils.o +OBJS = src/ActionElement.o src/ActionLayer.o src/AIPlaer.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/ConstraintResolver.o src/Damage.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameStateDuel.o src/GuiCardsController.o src/GuiLayers.o src/ManaCost.o src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/Player.o src/SimpleMenuItem.o src/ActionStack.o src/Subtypes.o src/TargetChooser.o src/TexturesCache.o src/utils.o INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src diff --git a/projects/mtg/Makefile.3xx b/projects/mtg/Makefile.3xx index 14d523e76..2fee875bb 100644 --- a/projects/mtg/Makefile.3xx +++ b/projects/mtg/Makefile.3xx @@ -1,5 +1,5 @@ TARGET = template -OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GroupOfCards.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o +OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index d73069212..14b7c0c3c 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -3,7 +3,6 @@ #define _CARDS_H_ #include "MTGAbility.h" -#include "GroupOfCards.h" #include "ManaCost.h" #include "CardDescriptor.h" #include "AIPlayer.h" @@ -2940,6 +2939,7 @@ public: }; //GenericKirdApe +//Erwan 2008/11/15 : this cannot work as type is never initialized... class AGenericKirdApe:public MTGAbility{ public: int init; diff --git a/projects/mtg/include/GroupOfCards.h b/projects/mtg/include/GroupOfCards.h deleted file mode 100644 index 48debd356..000000000 --- a/projects/mtg/include/GroupOfCards.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef _GROUPOFCARDS_H_ -#define _GROUPOFCARDS_H_ - -#include "GameObserver.h" -#include "MTGCardInstance.h" - -#define FILTER_SUBTYPE 1 - -#define GROUP_LIMIT 10 - -class GroupOfCards{ - protected: - GameObserver * game; - public: - GroupOfCards(GameObserver * _game); - //virtual ~GroupOfCards(); - virtual int includes(MTGCardInstance * card){return 0;}; -}; - -class GroupOfCreatures:public GroupOfCards{ - protected: - int filter; - int filterValue; - public: - GroupOfCreatures(GameObserver * _game, int _filter, int _filterValue); - int includes(MTGCardInstance * card); -}; - -class GroupOfSpecificCards:public GroupOfCards{ - protected: - int nb_cards; - MTGCardInstance * cards[GROUP_LIMIT]; - public: - int includes(MTGCardInstance * card); - GroupOfSpecificCards(GameObserver * _game, MTGCardInstance * _creatures[], int _nb_creatures); - GroupOfSpecificCards(GameObserver * _game, MTGCardInstance * card); -}; - -#endif diff --git a/projects/mtg/include/GroupOfCreatures.h b/projects/mtg/include/GroupOfCreatures.h deleted file mode 100644 index d0cfa8e24..000000000 --- a/projects/mtg/include/GroupOfCreatures.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _GROUPOFCREATURES_H_ -#define _GROUPOFCREATURES_H_ - -class Group - -#endif diff --git a/projects/mtg/src/GroupOfCards.cpp b/projects/mtg/src/GroupOfCards.cpp deleted file mode 100644 index f65081c88..000000000 --- a/projects/mtg/src/GroupOfCards.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "../include/debug.h" -#include "../include/GroupOfCards.h" - - -GroupOfCards::GroupOfCards(GameObserver * _game){ - game = _game; -} - -GroupOfCreatures::GroupOfCreatures(GameObserver * _game, int _filter, int _filterValue):GroupOfCards(_game){ - filter = _filter; - filterValue = _filterValue; -} - -int GroupOfCreatures::includes(MTGCardInstance * card){ - if (!game->isACreature(card)){ - return 0; - } - switch (filter){ - case FILTER_SUBTYPE: - return card->hasSubtype( filterValue); - break; - default: - return 0; - } -} - - -GroupOfSpecificCards::GroupOfSpecificCards(GameObserver * _game, MTGCardInstance * _cards[], int _nb_cards):GroupOfCards(_game){ - int i; - nb_cards = _nb_cards; - for (i=0; i - - @@ -609,14 +605,6 @@ RelativePath=".\include\GameStateShop.h" > - - - -