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

massive update, additions and changelog in first comment.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2010-10-18 10:46:36 +00:00
parent 211deca011
commit d13e8904b5
33 changed files with 1539 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
projects/mtg/src/ActionStack.cpp
View File

@@ -215,7 +215,6 @@ bool Spell::RetraceWasPaid(){
const string Spell::getDisplayName() const {
return source->getName();
}
Spell::~Spell(){
SAFE_DELETE(cost);
SAFE_DELETE(tc);
@@ -390,7 +389,10 @@ int ActionStack::addAbility(MTGAbility * ability){
int ActionStack::addDraw(Player * player, int nb_cards){
DrawAction * draw = NEW DrawAction(mCount,player, nb_cards);
addAction(draw);
addAction(draw);
GameObserver *g = GameObserver::GetInstance();
WEvent * e = NEW WEventcardDraw(player,nb_cards);
g->receiveEvent(e);
return 1;
}
@@ -405,11 +407,19 @@ int ActionStack::AddNextGamePhase(){
NextGamePhase * next = NEW NextGamePhase(mCount);
addAction(next);
int playerId = 0;
if (game->currentActionPlayer == game->players[1]) playerId = 1;
game->currentActionPlayer = game->GetInstance()->currentActionPlayer;
if (game->currentActionPlayer == game->players[1]){ playerId = 1;}
interruptDecision[playerId] = 1;
return 1;
}
int ActionStack::AddNextCombatStep(){
if (getNext(NULL,NOT_RESOLVED)) return 0;
NextGamePhase * next = NEW NextGamePhase(mCount);
addAction(next);
return 1;
}
int ActionStack::setIsInterrupting(Player * player){
if (player == game->players[0]){
interruptDecision[0] = -1;