Changeset 6448 for code/branches/network2/src/orxonox/worldentities/pawns

Timestamp:

Jan 17, 2010, 11:37:48 AM (15 years ago)

Author:

scheusso

Message:

made registerVariables always private. otherwise bad things may happen with variables registered twice or even 3 times (as has happened in ControllableEntity until now)

Location:

code/branches/network2/src/orxonox/worldentities/pawns

Files:

• Pawn.h (modified) (2 diffs)
• SpaceShip.h (modified) (2 diffs)
• Spectator.h (modified) (2 diffs)

code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h

@@ -49 +49 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
-            void registerVariables();
 
             inline bool isAlive() const
@@ -151 +150 @@
 
         private:
+            void registerVariables();
             inline void setWeaponSystem(WeaponSystem* weaponsystem)
                 { this->weaponSystem_ = weaponsystem; }

code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -47 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
-            void registerVariables();
             void setConfigValues();
 
@@ -98 +97 @@
 
         private:
+            void registerVariables();
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
 
-        private:
             void loadEngineTemplate();
 

code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h

@@ -44 +44 @@
 
             void setConfigValues();
-            void registerVariables();
             virtual void tick(float dt);
 
@@ -63 +62 @@
 
         private:
+            void registerVariables();
             void changedGreeting();
             void changedFlareVisibility();