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

Timestamp:

Jul 11, 2005, 5:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

Location:

orxonox/trunk/src/lib/event

Files:

• event_handler.h (modified) (1 diff)
• key_mapper.cc (modified) (2 diffs)

orxonox/trunk/src/lib/event/event_handler.h

@@ -12 +12 @@
 #include "event_def.h"
 
+// FORWARD DECLARATION
 class EventListener;
-
+template <class T> class tList;
 
 //! The one Event Handler from Orxonox

orxonox/trunk/src/lib/event/key_mapper.cc

@@ -57 +57 @@
 //! this is the mapping array from names to ids: enter all orxonox.conf keys here
 /** @todo use globals.h for this.... everything is done there for those Options,
- * and you do not have to care about The namings
+ * and you do not have to care about The namings, as they might change
  */
 orxKeyMapping map[] = {
-  {&KeyMapper::PEV_UP,                   "Up"},
-  {&KeyMapper::PEV_DOWN,                 "Down"},
-  {&KeyMapper::PEV_LEFT,                 "Left"},
-  {&KeyMapper::PEV_RIGHT,                "Right"},
+  {&KeyMapper::PEV_UP,                   CONFIG_NAME_PLAYER_UP},
+  {&KeyMapper::PEV_DOWN,                 CONFIG_NAME_PLAYER_DOWN},
+  {&KeyMapper::PEV_LEFT,                 CONFIG_NAME_PLAYER_LEFT},
+  {&KeyMapper::PEV_RIGHT,                CONFIG_NAME_PLAYER_RIGHT},
   {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft"},
   {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight"},
 
-  {&KeyMapper::PEV_FIRE1,                "Fire"},
+  {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE},
   {&KeyMapper::PEV_FIRE1,                "Fire1"},
   {&KeyMapper::PEV_FIRE2,                "Fire2"},
@@ -74 +74 @@
 
 
-  {&KeyMapper::PEV_VIEW0,                "view0"},
-  {&KeyMapper::PEV_VIEW1,                "view1"},
-  {&KeyMapper::PEV_VIEW2,                "view2"},
-  {&KeyMapper::PEV_VIEW3,                "view3"},
-  {&KeyMapper::PEV_VIEW4,                "view4"},
-  {&KeyMapper::PEV_VIEW5,                "view5"},
-
-  {&KeyMapper::PEV_NEXT_WORLD,           "Next-World"},
-  {&KeyMapper::PEV_PREVIOUS_WORLD,       "Prev-World"},
-
-  {&KeyMapper::PEV_PAUSE,                "Pause"},
-  {&KeyMapper::PEV_QUIT,                 "Quit"},
+  {&KeyMapper::PEV_VIEW0,                CONFIG_NAME_VIEW0},
+  {&KeyMapper::PEV_VIEW1,                CONFIG_NAME_VIEW1},
+  {&KeyMapper::PEV_VIEW2,                CONFIG_NAME_VIEW2},
+  {&KeyMapper::PEV_VIEW3,                CONFIG_NAME_VIEW3},
+  {&KeyMapper::PEV_VIEW4,                CONFIG_NAME_VIEW4},
+  {&KeyMapper::PEV_VIEW5,                CONFIG_NAME_VIEW5},
+
+  {&KeyMapper::PEV_NEXT_WORLD,           CONFIG_NAME_NEXT_WORLD},
+  {&KeyMapper::PEV_PREVIOUS_WORLD,       CONFIG_NAME_PREV_WORLD},
+
+  {&KeyMapper::PEV_PAUSE,                CONFIG_NAME_PAUSE},
+  {&KeyMapper::PEV_QUIT,                 CONFIG_NAME_QUIT},
   {NULL, NULL}
 };