Get rid of two more define groups.

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;

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;