ActionElement.h: Replace defines, remove superfluous ";"

Defines do not follow scope rules, but enums do. Enum classes
even utilize strong type checking (but i am not sure about compiler
support for c++11 on all target platforms).

projects/mtg/src/ActionElement.cpp

@@ -8,7 +8,7 @@
 ActionElement::ActionElement(int id) :
     JGuiObject(id)
 {
-    activeState = INACTIVE;
+    activity = Inactive;
     modal = 0;
     waitingForAnswer = 0;
     currentPhase = MTG_PHASE_INVALID;
@@ -18,7 +18,7 @@ ActionElement::ActionElement(int id) :
 
 ActionElement::ActionElement(const ActionElement& a): JGuiObject(a)
 {
-    activeState = a.activeState;
+    activity = a.activity;
     tc = a.tc ? a.tc->clone() : NULL;
     currentPhase = a.currentPhase;
     newPhase = a.newPhase;
@@ -31,12 +31,6 @@ ActionElement::~ActionElement()
     SAFE_DELETE(tc);
 }
 
-int ActionElement::getActivity()
-{
-
-    return activeState;
-}
-
 int ActionElement::isReactingToTargetClick(Targetable * object)
 {
     if (MTGCardInstance * cObject = dynamic_cast<MTGCardInstance *>(object))

projects/mtg/src/MTGGamePhase.cpp

@@ -17,7 +17,7 @@ void MTGGamePhase::Update(float)
     int newState = observer->getCurrentGamePhase();
     if (newState != currentState)
     {
-        activeState = ACTIVE;
+        activity = Active;
         animation = 4;
         currentState = newState;
     }
@@ -28,18 +28,18 @@ void MTGGamePhase::Update(float)
     }
     else
     {
-        activeState = INACTIVE;
+        activity = Inactive;
         animation = 0;
     }
 }
 
 bool MTGGamePhase::NextGamePhase()
 {
-    if (activeState == INACTIVE)
+    if (activity == Inactive)
     {
         if (observer->currentActionPlayer == observer->currentlyActing())
         {
-            activeState = ACTIVE;
+            activity = Active;
             observer->userRequestNextGamePhase();
             return true;
         }