Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/world_entity.h

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/world_entities/world_entity.h (modified) (4 diffs)

orxonox/branches/levelloader/src/world_entities/world_entity.h

@@ -9 +9 @@
 #include "stdincl.h"
 #include "p_node.h"
+#include "objModel.h"
 
 //class CollisionCluster;
-class OBJModel;
+class CharacterAttributes;
+
 
 //! Basic class from which all interactive stuff in the world is derived from
@@ -22 +24 @@
   virtual ~WorldEntity ();
 
-  OBJModel* model;                  //!< The model that should be loaded for this entity.
+
+
   
   //void setCollision (CollisionCluster* newhull);
   
-  bool isFree ();
-  
   //void addAbility(Ability* ability);
   //void removeAbility(Ability* ability);
-  
+  void setDrawable (bool bDraw);  
+  bool isFree ();
+  void setCharacterAttributes(CharacterAttributes* charAttr);
+  CharacterAttributes* getCharacterAttributes();
+
   virtual void postSpawn ();
-  virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
-  virtual void destroy ();
+  virtual void leftWorld ();
+
+  virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void command (Command* cmd);
@@ -40 +45 @@
   void processDraw ();
   virtual void draw ();
-  void setDrawable (bool bDraw);
+  virtual void tick (float time);
   
-  virtual void leftWorld ();
+ protected:
+  OBJModel* model;                  //!< The model that should be loaded for this entity.
+  CharacterAttributes* charAttr;      //!< the character attributes of a world_entity
   
  private:
@@ -49 +56 @@
   bool bDraw;                         //!< If it should be visible.
 
+
+
   //CollisionCluster* collisioncluster; //!< The collision-Cluster of this entity.
 };