Changeset 5498 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Nov 7, 2005, 10:43:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: redocumented the WorldEntity and Weapon classes

File:

• trunk/src/world_entities/world_entity.h (modified) (5 diffs)

trunk/src/world_entities/world_entity.h

@@ -11 +11 @@
 
 // FORWARD DECLARATION
-class CharacterAttributes;
-class SoundEngine;
 class SoundBuffer;
 class SoundSource;
 class BVTree;
+
+//class CharacterAttributes;
 
 
@@ -28 +28 @@
 
   /** @see loadModelWithScale(const char*, float) @param fileName the File to load */
-  void loadModel(const char* fileName) { this->loadModelWithScale(fileName, 1.0); };
+  void loadModel(const char* fileName) { this->loadModelWithScale(fileName, 1.0f); };
+
   void loadModelWithScale(const char* fileName, float scaling);
 
@@ -42 +43 @@
   bool isVisible() const { return this->bVisible; };
 
-  void setCharacterAttributes(CharacterAttributes* charAttr);
-  CharacterAttributes* getCharacterAttributes();
+//  void setCharacterAttributes(CharacterAttributes* charAttr);
+//  CharacterAttributes* getCharacterAttributes();
 
   /** @returns a reference to the obb tree of this worldentity */
@@ -51 +52 @@
   virtual void leftWorld ();
 
-  virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
@@ -63 +63 @@
  protected:
   Model*                  model;            //!< The model that should be loaded for this entity.
-  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
   BVTree*                 obbTree;          //!< this is the obb tree reference needed for collision detection
+  //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 
  private: