[Orxonox-commit 3965] r8639 - in code/branches/presentation/src: modules/gametypes orxonox/infos

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-28 17:36:50 +0200 (Sat, 28 May 2011)
New Revision: 8639

Modified:
   code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h
   code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h
   code/branches/presentation/src/modules/gametypes/SpaceRace.h
   code/branches/presentation/src/orxonox/infos/GametypeInfo.cc
Log:
Fixed MSVC build and a warning.

Modified: code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h
===================================================================
--- code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h	2011-05-28 15:16:27 UTC (rev 8638)
+++ code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h	2011-05-28 15:36:50 UTC (rev 8639)
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Gametypes_STATIC_BUILD)
-#  ifdef Gametypes_SHARED_BUILD
+#  ifdef GAMETYPES_SHARED_BUILD
 #    define _GametypesExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )

Modified: code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h
===================================================================
--- code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h	2011-05-28 15:16:27 UTC (rev 8638)
+++ code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h	2011-05-28 15:36:50 UTC (rev 8639)
@@ -29,7 +29,7 @@
 #ifndef _RaceCheckPoint_H__
 #define _RaceCheckPoint_H__
 
-#include "objects/ObjectsPrereqs.h"
+#include "gametypes/GametypesPrereqs.h"
 
 #include "objects/triggers/DistanceTrigger.h"
 #include "interfaces/RadarViewable.h"
@@ -42,7 +42,7 @@
     The RaceCheckPoint class enables the creation of a check point to use in a SpaceRace level.
     !!! 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:
             RaceCheckPoint(BaseObject* creator);

Modified: code/branches/presentation/src/modules/gametypes/SpaceRace.h
===================================================================
--- code/branches/presentation/src/modules/gametypes/SpaceRace.h	2011-05-28 15:16:27 UTC (rev 8638)
+++ code/branches/presentation/src/modules/gametypes/SpaceRace.h	2011-05-28 15:36:50 UTC (rev 8639)
@@ -43,7 +43,7 @@
   @brief
     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;
         

Modified: code/branches/presentation/src/orxonox/infos/GametypeInfo.cc
===================================================================
--- code/branches/presentation/src/orxonox/infos/GametypeInfo.cc	2011-05-28 15:16:27 UTC (rev 8638)
+++ code/branches/presentation/src/orxonox/infos/GametypeInfo.cc	2011-05-28 15:36:50 UTC (rev 8639)
@@ -195,7 +195,7 @@
         
         this->startCountdown_ = countdown;
         // Set the counter to the ceiling of the current countdown.
-        this->counter_ = ceil(countdown);
+        this->counter_ = std::ceil(countdown);
         this->changedCountdownCounter();
     }