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

Removed modifications that should not have been part of my previous commit and were causing compilation problems.

Browse Source
This commit is contained in:
Xawotihs@gmail.com
2012-02-12 08:44:22 +00:00
parent a9ef271e74
commit ebc4eb331f
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/ActionStack.cpp
+2 -10
View File
@@ -965,17 +965,9 @@ void ActionStack::Update(float dt)
} }
} }
void ActionStack::cancelInterruptOffer(InterruptDecision cancelMode, bool log, Player* cancelMe) void ActionStack::cancelInterruptOffer(InterruptDecision cancelMode, bool log)
{ {
int playerId; int playerId = (observer->isInterrupting == observer->players[1]) ? 1 : 0;
if(cancelMe != NULL) {
if(observer->players[1] == cancelMe)
playerId = 1;
else
playerId = 0;
} else {
playerId = (observer->isInterrupting == observer->players[1]) ? 1 : 0;
}
interruptDecision[playerId] = cancelMode; interruptDecision[playerId] = cancelMode;
askIfWishesToInterrupt = NULL; askIfWishesToInterrupt = NULL;
observer->isInterrupting = NULL; observer->isInterrupting = NULL;