Changeset 5388 in orxonox.OLD for trunk/src/lib/shell
- Timestamp:
- Oct 16, 2005, 2:05:26 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/shell/shell.cc
r5383 r5388 125 125 if (this->bActive == true) 126 126 PRINTF(3)("The shell is already active\n"); 127 128 printf("ACT\n"); 127 129 this->bActive = true; 128 130 129 EventHandler::getInstance()-> setState(ES_SHELL);131 EventHandler::getInstance()->pushState(ES_SHELL); 130 132 this->setRelCoorSoft2D(0, 0, 1, 5); 131 133 … … 149 151 this->bActive = false; 150 152 151 EventHandler::getInstance()->setState(ES_GAME); 153 EventHandler::getInstance()->popState(); 154 152 155 this->setRelCoorSoft2D(0, -(int)this->shellHeight, 1, 5); 153 156 … … 445 448 if (event.type == SDLK_BACKQUOTE) 446 449 { 447 if ( EventHandler::getInstance()->getState() == ES_GAME)450 if (this->bActive == false) 448 451 this->activate(); 449 452 else
Note: See TracChangeset
for help on using the changeset viewer.