Changeset 7867 in orxonox.OLD for branches/gui/src/world_entities

Timestamp:

May 26, 2006, 1:19:46 PM (19 years ago)

Author:

bensch

Message:

Events better subscribed

Location:

branches/gui/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• creatures/md2_creature.cc (modified) (1 diff)
• space_ships/helicopter.cc (modified) (1 diff)
• space_ships/hover.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (3 diffs)
• weapons/crosshair.cc (modified) (1 diff)

branches/gui/src/world_entities/camera.cc

@@ -16 +16 @@
 
 #include "camera.h"
-
-#include "event_handler.h"
-
-using namespace std;
-
+#include "key_mapper.h"
 
 /**

branches/gui/src/world_entities/creatures/md2_creature.cc

@@ -32 +32 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 
 #include "graphics_engine.h"

branches/gui/src/world_entities/space_ships/helicopter.cc

@@ -28 +28 @@
 
 #include "key_mapper.h"
-#include "event_handler.h"
 #include "state.h"
 

branches/gui/src/world_entities/space_ships/hover.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 #include "state.h"
 

branches/gui/src/world_entities/space_ships/space_ship.cc

@@ -31 +31 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 
 #include "network_game_manager.h"

branches/gui/src/world_entities/space_ships/turbine_hover.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 #include "state.h"
 
@@ -32 +31 @@
 #include "dot_emitter.h"
 #include "sprite_particles.h"
-
-using namespace std;
 
 CREATE_FACTORY(TurbineHover, CL_TURBINE_HOVER);
@@ -176 +173 @@
 
 
-  //add events to the eventlist
-  registerEvent(KeyMapper::PEV_FORWARD);
-  registerEvent(KeyMapper::PEV_BACKWARD);
-  registerEvent(KeyMapper::PEV_LEFT);
-  registerEvent(KeyMapper::PEV_RIGHT);
-  registerEvent(KeyMapper::PEV_UP);
-  registerEvent(KeyMapper::PEV_DOWN);
-  registerEvent(KeyMapper::PEV_FIRE1);
-  registerEvent(KeyMapper::PEV_NEXT_WEAPON);
-  registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
-  registerEvent(EV_MOUSE_MOTION);
+  //add events to the eventlist of the Playable
+  this->registerEvent(KeyMapper::PEV_FORWARD);
+  this->registerEvent(KeyMapper::PEV_BACKWARD);
+  this->registerEvent(KeyMapper::PEV_LEFT);
+  this->registerEvent(KeyMapper::PEV_RIGHT);
+  this->registerEvent(KeyMapper::PEV_UP);
+  this->registerEvent(KeyMapper::PEV_DOWN);
+  this->registerEvent(KeyMapper::PEV_FIRE1);
+  this->registerEvent(KeyMapper::PEV_NEXT_WEAPON);
+  this->registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
+  this->registerEvent(EV_MOUSE_MOTION);
 
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);

branches/gui/src/world_entities/weapons/crosshair.cc

@@ -17 +17 @@
 
 #include "crosshair.h"
-#include "event_handler.h"
 
 #include "util/loading/load_param.h"