Changeset 7164 in orxonox.OLD for trunk/src/lib/event

Timestamp:

Feb 18, 2006, 5:32:35 PM (19 years ago)

Author:

bensch

Message:

deleted unused stuff

Location:

trunk/src/lib/event

Files:

• event_handler.cc (modified) (6 diffs)
• event_handler.h (modified) (2 diffs)

trunk/src/lib/event/event_handler.cc

@@ -26 +26 @@
 #include "class_list.h"
 
-#include "t_stack.h"
-
 using namespace std;
 
@@ -51 +49 @@
   this->state = ES_GAME;
   this->keyMapper = NULL;
-  this->stateStack = NULL;
   this->eventsGrabbed = false;
 }
@@ -78 +75 @@
     }
   }
-  delete this->stateStack;
   delete this->keyMapper;
 
@@ -99 +95 @@
     this->keyMapper->loadKeyBindings(iniParser);
   }
-  if (this->stateStack == NULL)
-    this->stateStack = new tStack<short>;
 }
 
@@ -109 +103 @@
 void EventHandler::pushState(elState state)
 {
-  if (likely(state != ES_NULL && state != ES_ALL && this->stateStack != NULL))
-  {
-    this->stateStack->push(this->state);
+  if (likely(state != ES_NULL && state != ES_ALL ))
+  {
+    this->stateStack.push(this->state);
     this->setState(state);
   }
@@ -126 +120 @@
 elState EventHandler::popState()
 {
-  if (unlikely(this->stateStack == NULL))
-    return ES_NULL;
-  elState state = (elState)this->stateStack->pop();
+  elState state =  (elState)stateStack.top();
+  this->stateStack.pop();
   if (state == ES_NULL)
   {

trunk/src/lib/event/event_handler.h

@@ -11 +11 @@
 #include "key_mapper.h"
 #include "event_def.h"
+#include <stack>
 
 // FORWARD DECLARATION
 class EventListener;
-template<class T> class tStack;
 class IniParser;
 
@@ -59 +59 @@
   EventListener*             listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
   elState                    state;                           //!< the state of the event handlder.
-  tStack<short>*             stateStack;                      //!< a stack for the States we are in.
+  std::stack<short>          stateStack;                      //!< a stack for the States we are in.
   KeyMapper*                 keyMapper;                       //!< reference to the key mapper.