Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/player.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/sound/src/player.h (modified) (3 diffs)

orxonox/branches/sound/src/player.h

@@ -4 +4 @@
 */
 
-#ifndef PLAYER_H
-#define PLAYER_H
+#ifndef _PLAYER_H
+#define _PLAYER_H
 
 #include "world_entity.h"
+#include "importer/object.h"
 
 //! Basic controllable WorldEntity
@@ -15 +16 @@
   
  public:
-  Player (bool isFree = false);
-  ~Player ();
+  Player(bool isFree = false);
+  ~Player();
   
-  virtual void post_spawn ();
-  virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
-  virtual void destroy ();
-  virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
-  virtual void command (Command* cmd);
+  virtual void postSpawn();
+  virtual void tick(float time);
+  virtual void hit(WorldEntity* weapon, Vector loc);
+  virtual void destroy();
+  virtual void collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags);
+  virtual void command(Command* cmd);
   
-  virtual void draw ();
-  virtual void get_lookat (Location* locbuf);
+  virtual void draw();
+  virtual void getLookat(Location* locbuf);
   
-  virtual void left_world ();
+  virtual void leftWorld();
   
  private:
@@ -34 +35 @@
   bool bFire;
   Vector velocity;
-  float travel_speed;
+  float travelSpeed;
   float acceleration;
+  GLuint objectList;
+  Object* obj;
   
-  void move (float time);
+  void move(float time);
   
 };
 
-#endif
+#endif /* _PLAYER_H */