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

Some organisational prep work before I start working on a new navigation method (ie replacement for CardSelector). The current design was to allocate a CardSelector and pass in its pointer to a variety of classes via their constructors. To simplify things, now we use a singleton style pattern with an Instance() function - this means that when I implement a new class to replace CardSelector, I only need to modify what's returned by the singleton callback - as long as the new pointer class supports the same function calls, it'll be a straight drop-in.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-10-22 08:41:44 +00:00
parent 84004c7c7f
commit e2de03d987
13 changed files with 177 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
projects/mtg/src/MTGRules.cpp
View File

@@ -725,12 +725,11 @@ int MTGAttackRule::reactToClick(MTGCardInstance * card){
//Graphically select the next card that can attack
if(!card->isAttacker()){
CardSelector * cs = game->mLayers->cs;
cs->PushLimitor();
cs->Limit(this,CardSelector::playZone);
cs->CheckUserInput(JGE_BTN_RIGHT);
cs->Limit(NULL,CardSelector::playZone);
cs->PopLimitor();
CardSelectorSingleton::Instance()->PushLimitor();
CardSelectorSingleton::Instance()->Limit(this,CardSelector::playZone);
CardSelectorSingleton::Instance()->CheckUserInput(JGE_BTN_RIGHT);
CardSelectorSingleton::Instance()->Limit(NULL,CardSelector::playZone);
CardSelectorSingleton::Instance()->PopLimitor();
}
card->toggleAttacker();
return 1;