Changeset 6854 in orxonox.OLD

Timestamp:

Jan 30, 2006, 3:51:42 AM (18 years ago)

Author:

patrick

Message:

trunk: the menu now works

Location:

trunk/src

Files:

• story_entities/simple_game_menu.cc (modified) (6 diffs)
• util/loading/game_loader.cc (modified) (1 diff)

trunk/src/story_entities/simple_game_menu.cc

@@ -109 +109 @@
   EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_RETURN);
   EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_SPACE);
+  EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_ESCAPE);
 
   this->dataTank->localCamera->setRelCoor(this->cameraVector);
@@ -196 +197 @@
       PRINTF(0)("setting texture to: |%s|\n", se->getMenuItemImage());
       ie->setTexture(se->getMenuItemImage());
-      ie->setRelCoor(0.0f,- (this->menuLayer[1]->menuList.size() * 10.0f), 0.0f);
+      ie->setRelCoor(0.0f,20.0f - (this->menuLayer[1]->menuList.size() * 10.0f), 0.0f);
       ie->setVisibility(false);
       this->menuLayer[1]->menuList.push_back(ie);
@@ -280 +281 @@
       if( this->menuSelected == this->menuStartGame)
       {
-        //this->stop();
         // switch to first submenu
         if( this->menuLayer[1]->menuList.size() == 0)
@@ -291 +291 @@
       }
     }
+    if( event.type == SDLK_ESCAPE && event.bPressed == true)
+    {
+      this->setNextStoryID(WORLD_ID_GAMEEND);
+      this->stop();
+    }
   }  /* ----------------- LAYER 2 ---------------*/
   else if( this->layerIndex == 1)
@@ -298 +303 @@
       this->setNextStoryID( this->menuLayer[1]->storyList[this->menuSelectedIndex]->getStoryID());
       this->stop();
+    }
+    if( event.type == SDLK_ESCAPE && event.bPressed == true)
+    {
+      this->switchMenuLayer(this->layerIndex, 0);
     }
   }
@@ -352 +361 @@
 
   this->layerIndex = layer2;
+  this->menuSelected = this->menuLayer[layer2]->menuList[0];
+  this->menuSelector->setAbsCoor(this->menuSelected->getAbsCoor());
 }
 

trunk/src/util/loading/game_loader.cc

@@ -73 +73 @@
   this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_PAUSE);
   this->eventHandler->subscribe(this, ES_ALL, EV_MAIN_QUIT);          //< External Quit Event
-  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_QUIT);
+  this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_QUIT);
   this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_NEXT_WORLD);
   this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_PREVIOUS_WORLD);