Changeset 7163 for code/trunk/src/orxonox/items

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/items/Engine.cc (modified) (1 diff)
• src/orxonox/items/Engine.h (modified) (2 diffs)
• src/orxonox/items/MultiStateEngine.h (modified) (2 diffs)

code/trunk/src/orxonox/items/Engine.cc

@@ -64 +64 @@
         this->boostBlur_ = 0;
 
-        this->setCarrierName("Engine");
         this->speedAdd_ = 0.0;
         this->speedMultiply_ = 1.0;

code/trunk/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/trunk/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_;