Changeset 8639

Timestamp:

May 28, 2011, 5:36:50 PM (14 years ago)

Author:

rgrieder

Message:

Fixed MSVC build and a warning.

Location:

code/branches/presentation/src

Files:

• modules/gametypes/GametypesPrereqs.h (modified) (1 diff)
• modules/gametypes/RaceCheckPoint.h (modified) (2 diffs)
• modules/gametypes/SpaceRace.h (modified) (1 diff)
• orxonox/infos/GametypeInfo.cc (modified) (1 diff)

code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h

@@ -44 +44 @@
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Gametypes_STATIC_BUILD)
-#  ifdef Gametypes_SHARED_BUILD
+#  ifdef GAMETYPES_SHARED_BUILD
 #    define _GametypesExport __declspec(dllexport)
 #  else

code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h

@@ -30 +30 @@
 #define _RaceCheckPoint_H__
 
-#include "objects/ObjectsPrereqs.h"
+#include "gametypes/GametypesPrereqs.h"
 
 #include "objects/triggers/DistanceTrigger.h"
@@ -43 +43 @@
     !!! Don't forget to control the indexes of your check points and to set one last check point!!!
   */
-    class _ObjectsExport RaceCheckPoint : public DistanceTrigger, public RadarViewable
+    class _GametypesExport RaceCheckPoint : public DistanceTrigger, public RadarViewable
     {
         public:

code/branches/presentation/src/modules/gametypes/SpaceRace.h

@@ -44 +44 @@
     The SpaceRace class enables the creation of a space race level, where the player has to reach check points in a given order.
   */
-    class _OrxonoxExport SpaceRace : public Gametype
+    class _GametypesExport SpaceRace : public Gametype
     {
         friend class RaceCheckPoint;

code/branches/presentation/src/orxonox/infos/GametypeInfo.cc

@@ -196 +196 @@
         this->startCountdown_ = countdown;
         // Set the counter to the ceiling of the current countdown.
-        this->counter_ = ceil(countdown);
+        this->counter_ = std::ceil(countdown);
         this->changedCountdownCounter();
     }