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

Timestamp:

Jul 12, 2010, 1:08:58 PM (14 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/items/Engine.h (modified) (2 diffs)
• src/orxonox/items/MultiStateEngine.h (modified) (2 diffs)

code/branches/presentation3/src/orxonox/items/Engine.h

@@ -46 +46 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void registerVariables();
             void setConfigValues();
 
@@ -127 +126 @@
 
         private:
+            void registerVariables();
             void networkcallback_shipID();
 

code/branches/presentation3/src/orxonox/items/MultiStateEngine.h

@@ -53 +53 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void registerVariables();
 
             virtual void tick(float dt);
@@ -68 +67 @@
 
         private:
+            void registerVariables();
+
             int state_;
             int oldState_;