Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8639


Ignore:
Timestamp:
May 28, 2011, 5:36:50 PM (13 years ago)
Author:
rgrieder
Message:

Fixed MSVC build and a warning.

Location:
code/branches/presentation/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h

    r8631 r8639  
    4444
    4545#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Gametypes_STATIC_BUILD)
    46 #  ifdef Gametypes_SHARED_BUILD
     46#  ifdef GAMETYPES_SHARED_BUILD
    4747#    define _GametypesExport __declspec(dllexport)
    4848#  else
  • code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h

    r8631 r8639  
    3030#define _RaceCheckPoint_H__
    3131
    32 #include "objects/ObjectsPrereqs.h"
     32#include "gametypes/GametypesPrereqs.h"
    3333
    3434#include "objects/triggers/DistanceTrigger.h"
     
    4343    !!! Don't forget to control the indexes of your check points and to set one last check point!!!
    4444  */
    45     class _ObjectsExport RaceCheckPoint : public DistanceTrigger, public RadarViewable
     45    class _GametypesExport RaceCheckPoint : public DistanceTrigger, public RadarViewable
    4646    {
    4747        public:
  • code/branches/presentation/src/modules/gametypes/SpaceRace.h

    r8631 r8639  
    4444    The SpaceRace class enables the creation of a space race level, where the player has to reach check points in a given order.
    4545  */
    46     class _OrxonoxExport SpaceRace : public Gametype
     46    class _GametypesExport SpaceRace : public Gametype
    4747    {
    4848        friend class RaceCheckPoint;
  • code/branches/presentation/src/orxonox/infos/GametypeInfo.cc

    r8637 r8639  
    196196        this->startCountdown_ = countdown;
    197197        // Set the counter to the ceiling of the current countdown.
    198         this->counter_ = ceil(countdown);
     198        this->counter_ = std::ceil(countdown);
    199199        this->changedCountdownCounter();
    200200    }
Note: See TracChangeset for help on using the changeset viewer.