- Fix an android warning (false instead of null in GuiCombat)

- removed unnecessary "if" in some parts of MTGRules.cpp
2013-01-27 02:09:10 +00:00
parent f6e95af995
commit d8da70361a
2 changed files with 23 additions and 25 deletions
--- a/projects/mtg/src/GuiCombat.cpp
+++ b/projects/mtg/src/GuiCombat.cpp
@@ -41,7 +41,7 @@ struct Right: public Exp
 JTexture* GuiCombat::ok_tex = NULL;

 GuiCombat::GuiCombat(GameObserver* go) :
-    GuiLayer(go), active(0), activeAtk(NULL), ok(SCREEN_WIDTH - MARGIN, 210, 1, 0, 255), enemy_avatar(SCREEN_WIDTH
+    GuiLayer(go), active(NULL), activeAtk(NULL), ok(SCREEN_WIDTH - MARGIN, 210, 1, 0, 255), enemy_avatar(SCREEN_WIDTH
                    - MARGIN, TOP_LINE, 2, 0, 255), cursor_pos(NONE), step(DAMAGE)
 {
    if (NULL == ok_tex && go->getResourceManager())