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

Timestamp:

Oct 3, 2006, 2:38:31 PM (18 years ago)

Author:

bensch

Message:

compiles better on Windows

Location:

trunk/src/lib/event

Files:

• event_def.h (modified) (3 diffs)
• event_handler.h (modified) (1 diff)
• event_listener.h (modified) (1 diff)

trunk/src/lib/event/event_def.h

@@ -8 +8 @@
 
 #ifdef HAVE_SDL_H
-#include "SDL_keysym.h"
+ #include "SDL_keysym.h"
 #else
-#include "SDL/SDL_keysym.h"
+ #include "SDL/SDL_keysym.h"
 #endif
 
-
 //! these are the extended event types, that are not included in SDL_keysym
-typedef enum extEventTyes
-{
+typedef enum {
   EV_MOUSE_BUTTON_LEFT           = SDLK_LAST + 1,
   EV_MOUSE_BUTTON_MIDDLE,
@@ -37 +35 @@
 
   EV_NUMBER
-};
+} extEventTyes;
 
 
 //! this is an enumeration of all states of the event_handler/game
-typedef enum elState
+typedef enum
 {
   ES_NULL         = -1,
@@ -48 +46 @@
   ES_MENU         = 2,       //!< orxonox menu state
   ES_SHELL        = 3,       //!< if we are in shell Modus
-
+  
   ES_ALL          = 4,       //!< you want to register events for all states
 
-  ES_NUMBER       = 5,       //!< the number of states
-};
-
-
-
+  ESTATE_NUMBER   = 5        //!< the number of states < Namespace-problem in windows.
+} elState;
 
 #endif /* _EVENT_DEF_H */

trunk/src/lib/event/event_handler.h

@@ -71 +71 @@
   static EventHandler*         singletonRef;                    //!< the singleton reference
 
-  std::vector<EventListener*>  listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
+  std::vector<EventListener*>  listeners[ESTATE_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
   elState                      state;                           //!< the state of the event handlder.
   std::stack<short>            stateStack;                      //!< a stack for the States we are in.
   KeyMapper                    keyMapper;                       //!< reference to the key mapper.
 
-  bool                         bUNICODE[ES_NUMBER];             //!< If unicode should be enabled.
+  bool                         bUNICODE[ESTATE_NUMBER];             //!< If unicode should be enabled.
   bool                         eventsGrabbed;                   //!< If the events should be grabbed
 

trunk/src/lib/event/event_listener.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "event_def.h"
 #include "event.h"
-#include "event_def.h"
 
 //! A class for event listener