Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- Minor tweaks in the hope to fix some Valgrind error logs
This commit is contained in:
wagic.the.homebrew
2008-12-02 14:00:28 +00:00
parent b9a9ab6bfa
commit acceb55f92
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/include/GameStateMenu.h
View File

@@ -20,7 +20,7 @@
#define STATE_FIRST_TIME 4 #define STATE_FIRST_TIME 4
#define STATE_WARNING 5 #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 ALPHA_WARNING 0
#define DEFAULT_ANGLE_MULTIPLIER 0.4 #define DEFAULT_ANGLE_MULTIPLIER 0.4

4
projects/mtg/src/CardDescriptor.cpp
View File

@@ -7,7 +7,9 @@ CardDescriptor::CardDescriptor(): MTGCardInstance(){
} }
int CardDescriptor::init(){ int CardDescriptor::init(){
return MTGCardInstance::init(); int result = MTGCardInstance::init();
initAttackersDefensers();
return result;
} }
MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card){ MTGCardInstance * CardDescriptor::match_or(MTGCardInstance * card){

1
projects/mtg/src/ManaCost.cpp
View File

@@ -185,6 +185,7 @@ int ManaCost::add(int color, int value){
} }
int ManaCost::add(ManaCost * _cost){ int ManaCost::add(ManaCost * _cost){
if(!_cost) return 0;
for (int i=0; i< MTG_NB_COLORS; i++){ for (int i=0; i< MTG_NB_COLORS; i++){
cost[i]+= _cost->getCost(i); cost[i]+= _cost->getCost(i);
} }