Changeset 4975 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 9, 2005, 12:23:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: player should be able to load its preferences from an external file
removed the obsolete ObjectManager that has been redesigned as FastFactory.

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• player.h (modified) (1 diff)
• weapons/projectile.h (modified) (3 diffs)
• weapons/weapon.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -56 +56 @@
 }
 
-
-/**
- *  destructs the player, deletes alocated memory
-*/
-Player::~Player ()
-{
-  /* do not delete the weapons, they are contained in the pnode tree
-     and will be deleted there.
-     this only frees the memory allocated to save the list.
-  */
-  delete this->weaponMan;
+/**
+ * loads a Players information from a specified file.
+ * @param fileName the name of the File to load the player from (absolute path)
+ */
+Player::Player(const char* fileName)
+{
+  this->init();
+  TiXmlDocument doc(fileName);
+
+  if(!doc.LoadFile())
+  {
+    PRINTF(2)("Loading file %s failed for player.\n", fileName);
+    return;
+  }
+
+  this->loadParams(doc.RootElement());
 }
 
@@ -96 +101 @@
 
   this->weaponMan->changeWeaponConfig(0);
+}
+
+/**
+ *  destructs the player, deletes alocated memory
+ */
+Player::~Player ()
+{
+  /* do not delete the weapons, they are contained in the pnode tree
+  and will be deleted there.
+  this only frees the memory allocated to save the list.
+  */
+  delete this->weaponMan;
 }
 

orxonox/trunk/src/world_entities/player.h

@@ -29 +29 @@
   public:
     Player();
+    Player(const char* fileName);
     Player(const TiXmlElement* root);
     virtual ~Player();

orxonox/trunk/src/world_entities/weapons/projectile.h

@@ -23 +23 @@
 #include "world_entity.h"
 #include "vector.h"
-
-class ParticleEmitter;
 
 class Projectile : public WorldEntity
@@ -53 +51 @@
 
   protected:
-
     // energy
     float                 energyMin;
@@ -65 +62 @@
 
     Vector                velocity;                  //!< velocity of the projectile.
-
-    ParticleEmitter*      emitter;                   //!< For special effects each Projectile has an emitter.
 };
 

orxonox/trunk/src/world_entities/weapons/weapon.h

@@ -71 +71 @@
 /**
  * This is used as a container for all the different kinds of weapons that may exist
+ *
+ * Weapons have certain states, and actions, that can inflict them.
+ * ex. Action WA_SHOOT leeds to State WS_SHOOTING.
+ * each action has a sound connected to it,
+ * each state a time and an animation.
  */
 class Weapon : public WorldEntity