Changeset 10218 for code/trunk/src/modules/objects/controllers

Timestamp:

Jan 31, 2015, 11:29:45 PM (9 years ago)

Author:

landauf

Message:

fixed build and warnings with MSVC

Location:

code/trunk/src/modules/objects/controllers

Files:

• TeamTargetProxy.h (modified) (2 diffs)
• TurretController.cc (modified) (1 diff)
• TurretController.h (modified) (2 diffs)

code/trunk/src/modules/objects/controllers/TeamTargetProxy.h

@@ -30 +30 @@
 #define _TeamTargetProxy_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/FormationController.h"
 
@@ -45 +45 @@
             has to be controllable and ticks every second (performance?)
     */
-    class _OrxonoxExport TeamTargetProxy : public FormationController, public Tickable
+    class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable
     {
         public:

code/trunk/src/modules/objects/controllers/TurretController.cc

@@ -29 +29 @@
 #include "TurretController.h"
 #include "worldentities/pawns/Pawn.h"
-#include "Turret.h"
+#include "objects/Turret.h"
 
  namespace orxonox

code/trunk/src/modules/objects/controllers/TurretController.h

@@ -34 +34 @@
 #define _TurretController_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/ArtificialController.h"
 
@@ -45 +45 @@
         The controllableEntity gets casted to Turret, so this controller won't work for anything else.
     */
-    class _OrxonoxExport TurretController : public ArtificialController, public Tickable
+    class _ObjectsExport TurretController : public ArtificialController, public Tickable
     {
         public: