From ebc4eb331f5d4dc9b78b094f5c909447ef6a7918 Mon Sep 17 00:00:00 2001 From: "Xawotihs@gmail.com" Date: Sun, 12 Feb 2012 08:44:22 +0000 Subject: [PATCH] Removed modifications that should not have been part of my previous commit and were causing compilation problems. --- projects/mtg/src/ActionStack.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index a33c84eca..ea48af30e 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -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; - if(cancelMe != NULL) { - if(observer->players[1] == cancelMe) - playerId = 1; - else - playerId = 0; - } else { - playerId = (observer->isInterrupting == observer->players[1]) ? 1 : 0; - } + int playerId = (observer->isInterrupting == observer->players[1]) ? 1 : 0; interruptDecision[playerId] = cancelMode; askIfWishesToInterrupt = NULL; observer->isInterrupting = NULL;