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

Erwan

Browse Source 
-code cleanup
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-01-31 06:56:40 +00:00
parent e3d98f23f9
commit 1f88c30cfd
4 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/mtg/include/MTGCard.h
View File

@@ -1,7 +1,7 @@
#ifndef _MTGCARD_H_ #ifndef _MTGCARD_H_
#define _MTGCARD_H_ #define _MTGCARD_H_
#define MTGCARD_NAME_SIZE 30 #define MTGCARD_NAME_SIZE 16
#define MTG_IMAGE_WIDTH 200 #define MTG_IMAGE_WIDTH 200
#define MTG_IMAGE_HEIGHT 285 #define MTG_IMAGE_HEIGHT 285
@@ -9,9 +9,6 @@
#define MTG_MINIIMAGE_WIDTH 45 #define MTG_MINIIMAGE_WIDTH 45
#define MTG_MINIIMAGE_HEIGHT 64 #define MTG_MINIIMAGE_HEIGHT 64
#define MAX_TYPES_PER_CARD 10
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>

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

@@ -33,7 +33,6 @@ class MTGCardInstance: public CardPrimitive, public MTGCard, public Damageable {
int lifeOrig; int lifeOrig;
MTGPlayerCards * belongs_to; MTGPlayerCards * belongs_to;
MTGAbility * untapBlockerAbilities[10];
MTGCardInstance * getNextPartner(); MTGCardInstance * getNextPartner();
void initMTGCI(); void initMTGCI();
int setDefenser(MTGCardInstance * c); int setDefenser(MTGCardInstance * c);
@@ -57,7 +56,6 @@ class MTGCardInstance: public CardPrimitive, public MTGCard, public Damageable {
// The recommended method to test for summoning Sickness ! // The recommended method to test for summoning Sickness !
int hasSummoningSickness(); int hasSummoningSickness();
MTGCardInstance * changeController(Player * newcontroller); MTGCardInstance * changeController(Player * newcontroller);
float changedZoneRecently;
Player * owner; Player * owner;
Counters * counters; Counters * counters;
int typeAsTarget(){return TARGET_CARD;} int typeAsTarget(){return TARGET_CARD;}

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

@@ -107,7 +107,6 @@ void MTGCardInstance::initMTGCI(){
type_as_damageable = DAMAGEABLE_MTGCARDINSTANCE; type_as_damageable = DAMAGEABLE_MTGCARDINSTANCE;
banding = NULL; banding = NULL;
owner = NULL; owner = NULL;
changedZoneRecently = 0;
counters = NEW Counters(this); counters = NEW Counters(this);
previousZone = NULL; previousZone = NULL;
previous = NULL; previous = NULL;

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

@@ -150,7 +150,6 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
MTGCardInstance * ret = copy; MTGCardInstance * ret = copy;
to->addCard(copy); to->addCard(copy);
copy->changedZoneRecently = 1.f;
GameObserver *g = GameObserver::GetInstance(); GameObserver *g = GameObserver::GetInstance();
WEvent * e = NEW WEventZoneChange(copy, from, to); WEvent * e = NEW WEventZoneChange(copy, from, to);
g->receiveEvent(e); g->receiveEvent(e);