Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8740


Ignore:
Timestamp:
Jul 10, 2011, 5:46:32 PM (13 years ago)
Author:
landauf
Message:

fixed some warnings, added vs to ignore list

Location:
code/branches/output
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/output

    • Property svn:ignore
      •  

        old new  
        11build
        22codeblocks
         3vs
        34dependencies
  • code/branches/output/src/modules/gametypes/SpaceRace.cc

    r8706 r8740  
    5555            this->clock_.capture();
    5656            int s = this->clock_.getSeconds();
    57             int ms = this->clock_.getMilliseconds()-1000*s;
     57            int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
    5858            const std::string& message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
    5959                        + "You didn't reach the check point " + multi_cast<std::string>(this->bCheckpointsReached_+1)
     
    6767            this->clock_.capture();
    6868            int s = this->clock_.getSeconds();
    69             int ms = this->clock_.getMilliseconds()-1000*s;
     69            int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
    7070            const std::string& message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
    7171                        + "." + multi_cast<std::string>(ms) + " seconds.";
     
    9595        this->clock_.capture();
    9696        int s = this->clock_.getSeconds();
    97         int ms = this->clock_.getMilliseconds()-1000*s;
     97        int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
    9898        const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached())
    9999                        + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
  • code/branches/output/src/orxonox/infos/GametypeInfo.cc

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