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

Erwan

Browse Source 
-fix issue 270
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-01-04 13:51:39 +00:00
parent 441b8a0f3a
commit 3e33e2b756
5 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,10 +104,7 @@ void ActionLayer::Render (){
for (int i=0;i<mCount;i++){
if (mObjects[i]!=NULL){
ActionElement * currentAction = (ActionElement *)mObjects[i];
//if (currentAction->getActivity() > 0){
currentAction->Render();
//return;
//}
}
}
}
@@ -119,11 +116,6 @@ void ActionLayer::setCurrentWaitingAction(ActionElement * ae){
}
TargetChooser * ActionLayer::getCurrentTargetChooser(){
/* for (int i=0;i<mCount;i++){
ActionElement * currentAction = (ActionElement *)mObjects[i];
if(currentAction->waitingForAnswer) return currentAction->tc;
}
return NULL;*/
if (currentWaitingAction && currentWaitingAction->waitingForAnswer)
return currentWaitingAction->tc;
return NULL;
@@ -247,8 +239,7 @@ void ActionLayer::doReactTo(int menuIndex){
}
void ActionLayer::ButtonPressed(int controllerid, int controlid){
if (controlid == -1){
}else{
if (controlid != -1){
ActionElement * currentAction = (ActionElement *)mObjects[controlid];
currentAction->reactToTargetClick(menuObject);
}