From acceb55f92ea51b05adb22f0648679bbb9eba989 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew" Date: Tue, 2 Dec 2008 14:00:28 +0000 Subject: [PATCH] Erwan - Minor tweaks in the hope to fix some Valgrind error logs --- projects/mtg/include/GameStateMenu.h | 2 +- projects/mtg/src/CardDescriptor.cpp | 4 +++- projects/mtg/src/ManaCost.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/mtg/include/GameStateMenu.h b/projects/mtg/include/GameStateMenu.h index 8bce9f280..b4f39e0b9 100644 --- a/projects/mtg/include/GameStateMenu.h +++ b/projects/mtg/include/GameStateMenu.h @@ -20,7 +20,7 @@ #define STATE_FIRST_TIME 4 #define STATE_WARNING 5 -#define GAME_VERSION "WTH?! 0.2.2 - by WilLoW" +#define GAME_VERSION "WTH?! 0.3.0 - by WilLoW" #define ALPHA_WARNING 0 #define DEFAULT_ANGLE_MULTIPLIER 0.4 diff --git a/projects/mtg/src/CardDescriptor.cpp b/projects/mtg/src/CardDescriptor.cpp index 277e60709..0f79e0e60 100644 --- a/projects/mtg/src/CardDescriptor.cpp +++ b/projects/mtg/src/CardDescriptor.cpp @@ -7,7 +7,9 @@ CardDescriptor::CardDescriptor(): MTGCardInstance(){ } int CardDescriptor::init(){ - return MTGCardInstance::init(); + int result = MTGCardInstance::init(); + initAttackersDefensers(); + return result; } MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card){ diff --git a/projects/mtg/src/ManaCost.cpp b/projects/mtg/src/ManaCost.cpp index 1b5fbb14b..46a71aa19 100644 --- a/projects/mtg/src/ManaCost.cpp +++ b/projects/mtg/src/ManaCost.cpp @@ -185,6 +185,7 @@ int ManaCost::add(int color, int value){ } int ManaCost::add(ManaCost * _cost){ + if(!_cost) return 0; for (int i=0; i< MTG_NB_COLORS; i++){ cost[i]+= _cost->getCost(i); }