[Orxonox-commit 3946] r8620 - code/branches/unity_build/src/orxonox/controllers

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-27 05:33:04 +0200 (Fri, 27 May 2011)
New Revision: 8620

Modified:
   code/branches/unity_build/src/orxonox/controllers/AIController.cc
   code/branches/unity_build/src/orxonox/controllers/AIController.h
   code/branches/unity_build/src/orxonox/controllers/DroneController.h
Log:
Moved two constants to the class they belong to.

Modified: code/branches/unity_build/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/unity_build/src/orxonox/controllers/AIController.cc	2011-05-27 03:28:59 UTC (rev 8619)
+++ code/branches/unity_build/src/orxonox/controllers/AIController.cc	2011-05-27 03:33:04 UTC (rev 8620)
@@ -36,7 +36,7 @@
 
 namespace orxonox
 {
-    static const float ACTION_INTERVAL = 1.0f;
+    const float AIController::ACTION_INTERVAL = 1.0f;
 
     CreateFactory(AIController);
 

Modified: code/branches/unity_build/src/orxonox/controllers/AIController.h
===================================================================
--- code/branches/unity_build/src/orxonox/controllers/AIController.h	2011-05-27 03:28:59 UTC (rev 8619)
+++ code/branches/unity_build/src/orxonox/controllers/AIController.h	2011-05-27 03:33:04 UTC (rev 8620)
@@ -49,6 +49,8 @@
             virtual void action();
 
         private:
+            static const float ACTION_INTERVAL;
+
             Timer actionTimer_;
     };
 }

Modified: code/branches/unity_build/src/orxonox/controllers/DroneController.h
===================================================================
--- code/branches/unity_build/src/orxonox/controllers/DroneController.h	2011-05-27 03:28:59 UTC (rev 8619)
+++ code/branches/unity_build/src/orxonox/controllers/DroneController.h	2011-05-27 03:33:04 UTC (rev 8620)
@@ -68,6 +68,8 @@
             bool isShooting_;
 
         private:
+            static const float ACTION_INTERVAL;
+
             Timer actionTimer_;
             WeakPtr<Pawn> owner_;
             Drone* drone_;