Changeset 5388 in orxonox.OLD for trunk/src/lib/shell/shell.cc

Timestamp:

Oct 16, 2005, 2:05:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented a t-Stack, for dynamic stacks, and integrated it into the Shell.

File:

• trunk/src/lib/shell/shell.cc (modified) (3 diffs)

trunk/src/lib/shell/shell.cc

@@ -125 +125 @@
   if (this->bActive == true)
     PRINTF(3)("The shell is already active\n");
+
+  printf("ACT\n");
   this->bActive = true;
 
-  EventHandler::getInstance()->setState(ES_SHELL);
+  EventHandler::getInstance()->pushState(ES_SHELL);
   this->setRelCoorSoft2D(0, 0, 1, 5);
 
@@ -149 +151 @@
   this->bActive = false;
 
-  EventHandler::getInstance()->setState(ES_GAME);
+  EventHandler::getInstance()->popState();
+
   this->setRelCoorSoft2D(0, -(int)this->shellHeight, 1, 5);
 
@@ -445 +448 @@
     if (event.type == SDLK_BACKQUOTE)
     {
-      if (EventHandler::getInstance()->getState() == ES_GAME)
+      if (this->bActive == false)
         this->activate();
       else