Fixed "Werror" related compilation problems on Linux and Meego.

2011-08-14 18:09:02 +00:00
parent 8f1e97f8f9
commit c188b4d104
20 changed files with 22 additions and 51 deletions
--- a/projects/mtg/src/ActionStack.cpp
+++ b/projects/mtg/src/ActionStack.cpp
@@ -758,7 +758,7 @@ int ActionStack::getActionElementFromCard(MTGCardInstance * card)
 {

 	if(!card)
-		return NULL;
+    return 0;
    for (size_t i = 0; i < mObjects.size(); i++)
    {
        Interruptible * current = (Interruptible *) mObjects[i];
@@ -767,7 +767,7 @@ int ActionStack::getActionElementFromCard(MTGCardInstance * card)
            return i;
        }
    }  
-    return NULL;
+    return 0;
 }

 Interruptible * ActionStack::getNext(Interruptible * previous, int type, int state, int display)