Changeset 7153 for code/branches/presentation3/src/orxonox/infos

Timestamp:

Jul 12, 2010, 1:08:58 PM (15 years ago)

Author:

scheusso

Message:

• merged network2 branch into presentation3 branch (lots of network traffic and cpu load improvements)
• fixed network related bugs in BigExplosion

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/infos/HumanPlayer.h (modified) (2 diffs)
• src/orxonox/infos/PlayerInfo.h (modified) (2 diffs)

code/branches/presentation3/src/orxonox/infos/GametypeInfo.h

@@ -45 +45 @@
             virtual ~GametypeInfo();
 
-            void registerVariables();
-
             inline bool hasStarted() const
                 { return this->bStarted_; }
@@ -74 +72 @@
 
         private:
+            void registerVariables();
+
             bool bStarted_;
             bool bEnded_;

code/branches/presentation3/src/orxonox/infos/HumanPlayer.h

@@ -43 +43 @@
             virtual ~HumanPlayer();
 
-            void registerVariables();
             void setConfigValues();
 
@@ -101 +100 @@
             std::string gametypeHudTemplate_;
             OverlayGroup* gametypeHud_;
+        private:
+            void registerVariables();
     };
 }

code/branches/presentation3/src/orxonox/infos/PlayerInfo.h

@@ -43 +43 @@
             PlayerInfo(BaseObject* creator);
             virtual ~PlayerInfo();
-
-            void registerVariables();
 
             virtual void changedName();
@@ -92 +90 @@
 
         private:
+            void registerVariables();
             void networkcallback_changedcontrollableentityID();
             void networkcallback_changedgtinfoID();