Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10218


Ignore:
Timestamp:
Jan 31, 2015, 11:29:45 PM (6 years ago)
Author:
landauf
Message:

fixed build and warnings with MSVC

Location:
code/trunk/src/modules
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/jump/Jump.cc

    r10215 r10218  
    595595
    596596        newPlatform = new JumpPlatformStatic(center_->getContext());
    597         addPlatform(newPlatform, center_->getPlatformStaticTemplate(), 0.0, -0.05*sectionLength);
     597        addPlatform(newPlatform, center_->getPlatformStaticTemplate(), 0.0, -0.05f*sectionLength);
    598598
    599599        platformWidth_ = newPlatform->getWidth();
     
    603603        {
    604604            newPlatform = new JumpPlatformStatic(center_->getContext());
    605             addPlatform(newPlatform, center_->getPlatformStaticTemplate(), xPosition, -0.05*sectionLength);
     605            addPlatform(newPlatform, center_->getPlatformStaticTemplate(), xPosition, -0.05f*sectionLength);
    606606            newPlatform = new JumpPlatformStatic(center_->getContext());
    607             addPlatform(newPlatform, center_->getPlatformStaticTemplate(), -xPosition, -0.05*sectionLength);
     607            addPlatform(newPlatform, center_->getPlatformStaticTemplate(), -xPosition, -0.05f*sectionLength);
    608608        }
    609609    }
     
    616616        float sectionEnd = (1 + sectionNumber_) * sectionLength;
    617617
    618         int numI = 6;
    619         int numJ = 4;
     618        const int numI = 6;
     619        const int numJ = 4;
    620620
    621621        enum PlatformType
     
    12631263    {
    12641264        float platformSpeed = center_->getPlatformSpeed();
    1265         return randomPosition(0.5*platformSpeed, 1.5*platformSpeed);
     1265        return randomPosition(0.5f*platformSpeed, 1.5f*platformSpeed);
    12661266    }
    12671267
  • code/trunk/src/modules/jump/JumpFigure.cc

    r10215 r10218  
    184184        // Move through the left and right screen boundaries
    185185        Vector3 position = getPosition();
    186         if (position.x < -fieldWidth_*1.1)
    187         {
    188             position.x = fieldWidth_*1.1;
    189         }
    190         else if (position.x > fieldWidth_*1.1)
    191         {
    192             position.x = -fieldWidth_*1.1;
     186        if (position.x < -fieldWidth_*1.1f)
     187        {
     188            position.x = fieldWidth_*1.1f;
     189        }
     190        else if (position.x > fieldWidth_*1.1f)
     191        {
     192            position.x = -fieldWidth_*1.1f;
    193193        }
    194194        setPosition(position);
     
    207207        {
    208208            Vector3 velocity = getVelocity();
    209             velocity.z = (bootsActive_ ? 1.2*jumpSpeed_ : jumpSpeed_);
     209            velocity.z = (bootsActive_ ? 1.2f*jumpSpeed_ : jumpSpeed_);
    210210            setVelocity(velocity);
    211211
     
    221221        {
    222222            Vector3 velocity = getVelocity();
    223             velocity.z = 1.2*jumpSpeed_;
     223            velocity.z = 1.2f*jumpSpeed_;
    224224            setVelocity(velocity);
    225225        }
  • code/trunk/src/modules/jump/JumpPrereqs.h

    r10078 r10218  
    4343//-----------------------------------------------------------------------
    4444
    45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(PONG_STATIC_BUILD)
    46 #  ifdef PONG_SHARED_BUILD
     45#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(JUMP_STATIC_BUILD)
     46#  ifdef JUMP_SHARED_BUILD
    4747#    define _JumpExport __declspec(dllexport)
    4848#  else
  • code/trunk/src/modules/objects/controllers/TeamTargetProxy.h

    r10215 r10218  
    3030#define _TeamTargetProxy_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333#include "controllers/FormationController.h"
    3434
     
    4545            has to be controllable and ticks every second (performance?)
    4646    */
    47     class _OrxonoxExport TeamTargetProxy : public FormationController, public Tickable
     47    class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable
    4848    {
    4949        public:
  • code/trunk/src/modules/objects/controllers/TurretController.cc

    r10215 r10218  
    2929#include "TurretController.h"
    3030#include "worldentities/pawns/Pawn.h"
    31 #include "Turret.h"
     31#include "objects/Turret.h"
    3232
    3333 namespace orxonox
  • code/trunk/src/modules/objects/controllers/TurretController.h

    r10215 r10218  
    3434#define _TurretController_H__
    3535
    36 #include "OrxonoxPrereqs.h"
     36#include "objects/ObjectsPrereqs.h"
    3737#include "controllers/ArtificialController.h"
    3838
     
    4545        The controllableEntity gets casted to Turret, so this controller won't work for anything else.
    4646    */
    47     class _OrxonoxExport TurretController : public ArtificialController, public Tickable
     47    class _ObjectsExport TurretController : public ArtificialController, public Tickable
    4848    {
    4949        public:
Note: See TracChangeset for help on using the changeset viewer.