Changeset 5553 in orxonox.OLD

Timestamp:

Nov 12, 2005, 1:58:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Quit Events are listened on.

1. Quit-Button from the Windows Handler works
2. ctrl-c also quits the game.

(smoothly)

Location:

trunk/src

Files:

• lib/event/event_def.h (modified) (1 diff)
• lib/event/event_handler.cc (modified) (1 diff)
• util/loading/game_loader.cc (modified) (2 diffs)

trunk/src/lib/event/event_def.h

@@ -31 +31 @@
   EV_VIDEO_RESIZE,
 
+  EV_MAIN_QUIT,
+
   EV_UNKNOWN,
 

trunk/src/lib/event/event_handler.cc

@@ -308 +308 @@
           ev.resize = event.resize;
           ev.type = EV_VIDEO_RESIZE;
+          break;
+        case SDL_QUIT:
+          ev.type = EV_MAIN_QUIT;
           break;
         default:

trunk/src/util/loading/game_loader.cc

@@ -89 +89 @@
   this->eventHandler = EventHandler::getInstance();
   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_NEXT_WORLD);
@@ -274 +275 @@
  *  handle keyboard commands
  * @param event the event to handle
-*/
+ */
 void GameLoader::process(const Event& event)
 {
   if( event.type == KeyMapper::PEV_NEXT_WORLD)
-    {
-      if( likely(event.bPressed))
-        {
-          this->nextLevel();
-        }
-    }
+  {
+    if( likely(event.bPressed))
+    {
+      this->nextLevel();
+    }
+  }
   else if( event.type == KeyMapper::PEV_PREVIOUS_WORLD)
-    {
-      if( likely(event.bPressed))
-        {
-          this->previousLevel();
-        }
-    }
+  {
+    if( likely(event.bPressed))
+    {
+      this->previousLevel();
+    }
+  }
   else if( event.type == KeyMapper::PEV_PAUSE)
-    {
-      if( likely(event.bPressed))
-        {
-          if(this->isPaused)
-            this->resume();
-          else
-            this->pause();
-        }
-    }
+  {
+    if( likely(event.bPressed))
+    {
+      if(this->isPaused)
+        this->resume();
+      else
+        this->pause();
+    }
+  }
   else if( event.type == KeyMapper::PEV_QUIT)
-    {
-      if( event.bPressed) this->stop();
-    }
+  {
+    if( event.bPressed) this->stop();
+  }
+  else if (event.type == EV_MAIN_QUIT)
+    this->stop();
 }