Changeset 10632 in orxonox.OLD for branches/inputdevice/src/world_entities

Timestamp:

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

Author:

snellen

Message:

finished… testing needed

Location:

branches/inputdevice/src/world_entities

Files:

• player.cc (modified) (3 diffs)
• script_triggers/action_trigger.cc (modified) (1 diff)

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;
 }