From 01fe3b76f7eaaa85c47d2918dca83d1509acaf19 Mon Sep 17 00:00:00 2001 From: "jean.chalard" Date: Fri, 4 Sep 2009 16:58:17 +0000 Subject: [PATCH] J : * Minor bugfixes (mostly graphical bugs) --- projects/mtg/src/ActionLayer.cpp | 2 +- projects/mtg/src/DuelLayers.cpp | 2 +- projects/mtg/src/GuiHand.cpp | 4 ++-- projects/mtg/src/GuiPlay.cpp | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index b58c4d363..85dd3c850 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -143,7 +143,7 @@ int ActionLayer::receiveEventPlus(WEvent * event){ ActionElement * currentAction = (ActionElement *)mObjects[i]; result += currentAction->receiveEvent(event); } - return result; + return 0; } int ActionLayer::isReactingToTargetClick(Targetable * card){ diff --git a/projects/mtg/src/DuelLayers.cpp b/projects/mtg/src/DuelLayers.cpp index 3226e7931..adc24b34e 100644 --- a/projects/mtg/src/DuelLayers.cpp +++ b/projects/mtg/src/DuelLayers.cpp @@ -112,7 +112,7 @@ void DuelLayers::Render(){ int DuelLayers::receiveEvent(WEvent * e){ -#if 1 +#if 0 #define PRINT_IF(type) { type *foo = dynamic_cast(e); if (foo) cout << "Is a " #type " " << *foo << endl; } cout << "Received event " << e << " "; PRINT_IF(WEventZoneChange); diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp index bc332a7cd..4a58cf261 100644 --- a/projects/mtg/src/GuiHand.cpp +++ b/projects/mtg/src/GuiHand.cpp @@ -182,7 +182,7 @@ int GuiHandOpponent::receiveEventPlus(WEvent* e) card = NEW CardView(event->card, *(event->card->view)); else card = NEW CardView(event->card, ClosedRowX, 0); - card->t = -4*M_PI; + card->t = -4*M_PI; card->alpha = 255; cards.push_back(card); return 1; } @@ -201,7 +201,7 @@ int GuiHandOpponent::receiveEventMinus(WEvent* e) delete cv; return 1; } - return 1; + return 0; } return 0; } diff --git a/projects/mtg/src/GuiPlay.cpp b/projects/mtg/src/GuiPlay.cpp index 8a839066b..00064bc8d 100644 --- a/projects/mtg/src/GuiPlay.cpp +++ b/projects/mtg/src/GuiPlay.cpp @@ -173,13 +173,12 @@ int GuiPlay::receiveEventPlus(WEvent * e) (game->players[1]->inPlay() == event->to)) { CardView * card; - cout << "Play Plus " << event->card << endl; if (event->card->view) card = NEW CardView(event->card, *(event->card->view)); else card = NEW CardView(event->card, 0, 0); cards.push_back(card); - card->t = 0; + card->t = 0; card->alpha = 255; cs->Add(card); Replace(); return 1;