Changeset 10632 in orxonox.OLD

Timestamp:

Apr 12, 2007, 7:52:28 PM (17 years ago)

Author:

snellen

Message:

finished… testing needed

Location:

branches/inputdevice/src

Files:

• defs/orxonox_globals.h (modified) (1 diff)
• lib/event/key_mapper.cc (modified) (2 diffs)
• lib/event/key_mapper.h (modified) (1 diff)
• world_entities/player.cc (modified) (3 diffs)
• world_entities/script_triggers/action_trigger.cc (modified) (1 diff)

branches/inputdevice/src/defs/orxonox_globals.h

@@ -80 +80 @@
 #define   CONFIG_NAME_PLAYER_UP            "Up"
 #define   CONFIG_NAME_PLAYER_DOWN          "Down"
-
+#define   CONFIG_NAME_PLAYER_STRAFE_LEFT   "StrafeLeft"
+#define   CONFIG_NAME_PLAYER_STRAFE_RIGHT  "StrafeRight"
+#define   CONFIG_NAME_PLAYER_JUMP          "Jump"
+
+#define   CONFIG_NAME_PLAYER_ACTION        "Action"
 #define   CONFIG_NAME_PLAYER_FIRE          "Fire"
+#define   CONFIG_NAME_PLAYER_FIRE2         "Fire2"
 #define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next-Weapon"
 #define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Previous-Weapon"

branches/inputdevice/src/lib/event/key_mapper.cc

@@ -46 +46 @@
 int KeyMapper::PEV_STRAFE_RIGHT      = EV_UNKNOWN;
 int KeyMapper::PEV_JUMP              = EV_UNKNOWN;
+int KeyMapper::PEV_ACTION            = EV_UNKNOWN;
 
 int KeyMapper::PEV_FIRE1             = EV_UNKNOWN;
@@ -82 +83 @@
       {&KeyMapper::PEV_ROLL_RIGHT,           CONFIG_NAME_PLAYER_ROLL_LEFT,       SDLK_z},
       {&KeyMapper::PEV_ROLL_LEFT,            CONFIG_NAME_PLAYER_ROLL_RIGHT,      SDLK_c},
-      {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft",                       SDLK_q},
-      {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight",                      SDLK_e},
-      {&KeyMapper::PEV_JUMP,                 "Jump",                             SDLK_SPACE},
+      {&KeyMapper::PEV_STRAFE_LEFT,          CONFIG_NAME_PLAYER_STRAFE_LEFT,     SDLK_q},
+      {&KeyMapper::PEV_STRAFE_RIGHT,         CONFIG_NAME_PLAYER_STRAFE_RIGHT,    SDLK_e},
+      {&KeyMapper::PEV_JUMP,                 CONFIG_NAME_PLAYER_JUMP,            SDLK_SPACE},
+      {&KeyMapper::PEV_ACTION,               CONFIG_NAME_PLAYER_ACTION,          SDLK_u},
 
       {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE,            EV_MOUSE_BUTTON_LEFT},
-      {&KeyMapper::PEV_FIRE2,                "Fire2",                            EV_MOUSE_BUTTON_RIGHT},
+      {&KeyMapper::PEV_FIRE2,                CONFIG_NAME_PLAYER_FIRE2,           EV_MOUSE_BUTTON_RIGHT},
       {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON,     EV_MOUSE_BUTTON_WHEELUP},
       {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON,     EV_MOUSE_BUTTON_WHEELDOWN},

branches/inputdevice/src/lib/event/key_mapper.h

@@ -57 +57 @@
 
   static int PEV_JUMP;              //!< jump
+  static int PEV_ACTION;            //!< the action (or use) key
 
   static int PEV_FIRE1;             //!< fire button 1

branches/inputdevice/src/world_entities/player.cc

@@ -17 +17 @@
 #include "playable.h"
 #include "space_ships/space_ship.h"
+#include "script_triggers/action_trigger.h"
 
 #include "event_handler.h"
@@ -40 +41 @@
 
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_CHANGE_SHIP);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_ACTION);
 }
 
@@ -132 +134 @@
     this->enterNewPlayable();
   }
+  else if(event.type == KeyMapper::PEV_ACTION && event.bPressed)
+  {
+   for (ObjectList<ActionTrigger>::const_iterator it = ActionTrigger::objectList().begin();
+       it != ActionTrigger::objectList().end();
+       ++it)
+      (*it)->executeAction();
+  }
 
   if (likely(this->playable != NULL))

branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc

@@ -137 +137 @@
     }
   }
+
+  actionScheduled = false;
 }