Changeset 9163 in orxonox.OLD for branches/presentation/src/world_entities/creatures

Timestamp:

Jul 4, 2006, 6:16:00 PM (19 years ago)

Author:

patrick

Message:

aiming system integration

Location:

branches/presentation/src/world_entities/creatures

Files:

• fps_player.cc (modified) (1 diff)
• fps_player.h (modified) (3 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -29 +29 @@
 #include "weapons/cannon.h"
 #include "weapons/fps_sniper_rifle.h"
+#include "weapons/aiming_system.h"
 
 #include "aabb.h"

branches/presentation/src/world_entities/creatures/fps_player.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+
+class AimingSystem;
 
 
@@ -26 +29 @@
 
     virtual void reset();
-    
+
     virtual void destroy(WorldEntity* killer);
     virtual void respawn();
@@ -57 +60 @@
     float                 fallVelocity;        //!< velocity for falling down
     float                 jumpForce;           //!< the jump force
-    
+
     bool                  initWeapon;
+
+    AimingSystem*         aimingSystem;        //!< aiming system of the player
 };