Changeset 10632 in orxonox.OLD for branches/inputdevice/src/world_entities
- Timestamp:
- Apr 12, 2007, 7:52:28 PM (18 years ago)
- Location:
- branches/inputdevice/src/world_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/inputdevice/src/world_entities/player.cc
r10516 r10632 17 17 #include "playable.h" 18 18 #include "space_ships/space_ship.h" 19 #include "script_triggers/action_trigger.h" 19 20 20 21 #include "event_handler.h" … … 40 41 41 42 this->subscribeEvent(ES_GAME, KeyMapper::PEV_CHANGE_SHIP); 43 this->subscribeEvent(ES_GAME, KeyMapper::PEV_ACTION); 42 44 } 43 45 … … 132 134 this->enterNewPlayable(); 133 135 } 136 else if(event.type == KeyMapper::PEV_ACTION && event.bPressed) 137 { 138 for (ObjectList<ActionTrigger>::const_iterator it = ActionTrigger::objectList().begin(); 139 it != ActionTrigger::objectList().end(); 140 ++it) 141 (*it)->executeAction(); 142 } 134 143 135 144 if (likely(this->playable != NULL)) -
branches/inputdevice/src/world_entities/script_triggers/action_trigger.cc
r10631 r10632 137 137 } 138 138 } 139 140 actionScheduled = false; 139 141 } 140 142
Note: See TracChangeset
for help on using the changeset viewer.