Changeset 9869 in orxonox.OLD for trunk/src/world_entities/character_attributes.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/character_attributes.cc (modified) (9 diffs)

trunk/src/world_entities/character_attributes.cc

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -18 +18 @@
 
 #include "character_attributes.h"
-#include "stdincl.h" 
-
-
+
+
+ObjectListDefinition(CharacterAttributes);
 
 
@@ -27 +27 @@
    @todo this constructor is not jet implemented - do it
 */
-CharacterAttributes::CharacterAttributes () 
-{
-   this->setClassID(CL_CHARACTER_ATTRIBUTES, "CharacterAttributes");
+CharacterAttributes::CharacterAttributes ()
+{
+  this->registerObject(this, CharacterAttributes::_objectList);
 }
 
@@ -37 +37 @@
 
 */
-CharacterAttributes::~CharacterAttributes () 
+CharacterAttributes::~CharacterAttributes ()
 {
 }
@@ -97 +97 @@
 
 /**
- *  sets maximum health 
+ *  sets maximum health
  * @param health
 
@@ -130 +130 @@
  *  adds shield strength
  * @param strength
-   
+
    there is currently no limit to shieldstrength
  */
@@ -290 +290 @@
 /*=====================energy=====================*/
 /**
- *  sets the amount of energy 
+ *  sets the amount of energy
  * @param energy
  */
@@ -332 +332 @@
 
 /**
- *  gets the amount of energy 
+ *  gets the amount of energy
  * @returns energy
  */
@@ -358 +358 @@
   return this->energyConsumption;
 }
-  
+
 
 /**