Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 1, 2009, 10:04:54 AM (15 years ago)
Author:
rgrieder
Message:

Replaced orxonox::min and orxonox::max with std version (which do exactly the same).
The std version are in the <algorithm> header.

Location:
code/branches/core4/src/orxonox
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core4/src/orxonox/objects/worldentities/Backlight.cc

    r3257 r3262  
    2929#include "Backlight.h"
    3030
     31#include <algorithm>
    3132#include <OgreRibbonTrail.h>
    3233#include <OgreSceneManager.h>
     
    175176    void Backlight::stopturnonoff()
    176177    {
    177         this->postprocessingtime_ = max(0.0f, this->lifetime_ - this->turnofftime_);
     178        this->postprocessingtime_ = std::max(0.0f, this->lifetime_ - this->turnofftime_);
    178179
    179180        FadingBillboard::stopturnonoff();
  • code/branches/core4/src/orxonox/objects/worldentities/Camera.cc

    r3250 r3262  
    2929#include "Camera.h"
    3030
     31#include <algorithm>
    3132#include <OgreCamera.h>
    3233#include <OgreSceneManager.h>
     
    104105        {
    105106            // this stuff here may need some adjustments
    106             float coeff = min(1.0f, 15.0f * dt);
     107            float coeff = std::min(1.0f, 15.0f * dt);
    107108
    108109            Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
  • code/branches/core4/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r3257 r3262  
    2828
    2929#include "Pawn.h"
     30
     31#include <algorithm>
    3032
    3133#include "core/CoreIncludes.h"
     
    152154    void Pawn::setHealth(float health)
    153155    {
    154         this->health_ = min(health, this->maxHealth_);
     156        this->health_ = std::min(health, this->maxHealth_);
    155157    }
    156158
  • code/branches/core4/src/orxonox/overlays/console/InGameConsole.cc

    r3196 r3262  
    3030#include "InGameConsole.h"
    3131
     32#include <algorithm>
    3233#include <string>
    3334#include <OgreOverlay.h>
     
    425426
    426427        if (LINES > 0)
    427             this->maxCharsPerLine_ = max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
     428            this->maxCharsPerLine_ = std::max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
    428429        else
    429430            this->maxCharsPerLine_ = 10;
Note: See TracChangeset for help on using the changeset viewer.