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

Erwan

Browse Source 
- Triggers made more generic in the parser
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-07-12 07:47:54 +00:00
parent 3350ad6d03
commit 0ecbfb5d82
9 changed files with 148 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/src/ActionLayer.cpp
View File

@@ -44,7 +44,7 @@ int ActionLayer::unstoppableRenderInProgress(){
bool ActionLayer::CheckUserInput(u32 key){
GameObserver * g = GameObserver::GetInstance();
if (g->waitForExtraPayment && key == PSP_CTRL_CROSS){
game->waitForExtraPayment = NULL;
g->waitForExtraPayment = NULL;
return 1;
}
if (menuObject){
@@ -67,15 +67,16 @@ void ActionLayer::Update(float dt){
return;
}
modal = 0;
GameObserver * g = GameObserver::GetInstance();
for (int i=mCount -1 ;i>=0;i--){
if (mObjects[i]!= NULL){
ActionElement * currentAction = (ActionElement *)mObjects[i];
if (currentAction->testDestroy()){
game->removeObserver(currentAction);
g->removeObserver(currentAction);
}
}
}
int newPhase = GameObserver::GetInstance()->getCurrentGamePhase();
int newPhase = g->getCurrentGamePhase();
for (int i=0;i<mCount;i++){
if (mObjects[i]!=NULL){
ActionElement * currentAction = (ActionElement *)mObjects[i];