From 5419d87e4ed7ddfff1db32680a664fbd9dffe2d7 Mon Sep 17 00:00:00 2001
From: Tobias Loose <TobiasLoose@gmx.de>
Date: Sun, 17 Nov 2013 20:22:03 +0100
Subject: [PATCH] Get rid of two more define groups.

---
 projects/mtg/include/ActionStack.h    | 11 ++++++-----
 projects/mtg/include/CardDescriptor.h | 10 ++++++----
 projects/mtg/src/AIHints.cpp          |  3 +--
 projects/mtg/src/AIMomirPlayer.cpp    |  3 +--
 projects/mtg/src/TargetChooser.cpp    | 12 ++++++------
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/projects/mtg/include/ActionStack.h b/projects/mtg/include/ActionStack.h
index 48715c3d3..06e7f2afe 100644
--- a/projects/mtg/include/ActionStack.h
+++ b/projects/mtg/include/ActionStack.h
@@ -41,10 +41,6 @@ class DamageStack;
 class ManaCost;
 class TargetChooser;
 
-
-#define ACTIONSTACK_STANDARD 0
-#define ACTIONSTACK_TARGET 1
-
 class Interruptible: public PlayGuiObject, public Targetable
 {
 public:
@@ -183,6 +179,11 @@ public:
 class ActionStack :public GuiLayer
 {
 public:
+    enum ActionStackMode{
+        ACTIONSTACK_STANDARD = 0,
+        ACTIONSTACK_TARGET = 1
+    };
+
     typedef enum
     {
         NOT_DECIDED = 0,
@@ -204,7 +205,7 @@ protected:
     InterruptDecision interruptDecision[2];
     float timer;
     int currentState;
-    int mode;
+    ActionStackMode mode;
     int checked;
     ATutorialMessage* currentTutorial;
     int interruptBtnXOffset, noBtnXOffset, noToAllBtnXOffset, interruptDialogWidth;
diff --git a/projects/mtg/include/CardDescriptor.h b/projects/mtg/include/CardDescriptor.h
index 32cbbb11c..704e3d55f 100644
--- a/projects/mtg/include/CardDescriptor.h
+++ b/projects/mtg/include/CardDescriptor.h
@@ -9,9 +9,6 @@
 #include "MTGGameZones.h"
 #include "Counters.h"
 
-#define CD_OR 1
-#define CD_AND 2
-
 enum ENUM_COMPARISON_MODES
   {
     COMPARISON_NONE = 0,  // Needs to remain 0 for quick if(comparison_mode) checks
@@ -31,7 +28,12 @@ class CardDescriptor: public MTGCardInstance
     MTGCardInstance * match_not(MTGCardInstance * card);
   bool valueInRange(int comparisonMode, int value, int criterion);
  public:
-  int mode;
+  enum Operator{
+      CD_OR = 1,
+      CD_AND = 2
+  };
+
+  Operator mode;
   int powerComparisonMode;
   int toughnessComparisonMode;
   int manacostComparisonMode;
diff --git a/projects/mtg/src/AIHints.cpp b/projects/mtg/src/AIHints.cpp
index c090c86be..c8dae463f 100644
--- a/projects/mtg/src/AIHints.cpp
+++ b/projects/mtg/src/AIHints.cpp
@@ -74,8 +74,7 @@ AIHint::AIHint(string _line)
 
     if(action.find( "combo ") != string::npos)
     {
-        string Combo = "";
-        Combo = action.c_str() + 6;
+        string Combo = action.c_str() + 6;
         combos.push_back(Combo);
     }
     
diff --git a/projects/mtg/src/AIMomirPlayer.cpp b/projects/mtg/src/AIMomirPlayer.cpp
index c67a11b55..5daaa55b3 100644
--- a/projects/mtg/src/AIMomirPlayer.cpp
+++ b/projects/mtg/src/AIMomirPlayer.cpp
@@ -96,7 +96,6 @@ int AIMomirPlayer::computeActions()
         case MTG_PHASE_FIRSTMAIN:
         {
             CardDescriptor cd;
-            MTGCardInstance * card = NULL;
             ManaCost * potentialMana = getPotentialMana();
             int converted = potentialMana->getConvertedCost();
             SAFE_DELETE(potentialMana);
@@ -106,7 +105,7 @@ int AIMomirPlayer::computeActions()
                 //Attempt to put land into play
                 cd.init();
                 cd.setColor(Constants::MTG_COLOR_LAND);
-                card = cd.match(game->hand);
+                MTGCardInstance *card = cd.match(game->hand);
                 int canPutLandsIntoPlay = game->playRestrictions->canPutIntoZone(card, game->inPlay);
                 if (card && (canPutLandsIntoPlay == PlayRestriction::CAN_PLAY))
                 {
diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp
index 4db161dc0..2e73f23e4 100644
--- a/projects/mtg/src/TargetChooser.cpp
+++ b/projects/mtg/src/TargetChooser.cpp
@@ -294,13 +294,13 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 string attribute;
                 if (found2 != string::npos)
                 {
-                    cd->mode = CD_OR;
+                    cd->mode = CardDescriptor::CD_OR;
                     attribute = attributes.substr(0, found2);
                     attributes = attributes.substr(found2 + 1);
                 }
                 else if (foundAnd != string::npos)
                 {
-                    cd->mode = CD_AND;
+                    cd->mode = CardDescriptor::CD_AND;
                     attribute = attributes.substr(0, foundAnd);
                     attributes = attributes.substr(foundAnd + 1);
                 }
@@ -550,7 +550,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         else
                             cd->colors = card->colors;
                        
-                        cd->mode = CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;
                     }
                     else if( CDtype.find("types") != string::npos )
                     {
@@ -572,7 +572,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         cd->removeType("creature");
                         cd->removeType("planeswalker");
                         cd->removeType("tribal");
-                        cd->mode = CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;
                     }
                 }
                 else if (attribute.find("counter") != string::npos)
@@ -629,7 +629,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         { 
                             cd->SetExclusionColor(cid);
                         }
-                        cd->mode = CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;
                     }
 
                     if (attribute.find("chosencolor") != string::npos)
@@ -685,7 +685,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 }
             }
             if (nbminuses)
-                cd->mode = CD_AND;
+                cd->mode = CardDescriptor::CD_AND;
             typeName = typeName.substr(0, found);
         }
         if (cd)