Changeset 3262 for code/branches/core4/src/orxonox/objects/worldentities/pawns/Pawn.cc

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.

File:

• code/branches/core4/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -28 +28 @@
 
 #include "Pawn.h"
+
+#include <algorithm>
 
 #include "core/CoreIncludes.h"
@@ -152 +154 @@
     void Pawn::setHealth(float health)
     {
-        this->health_ = min(health, this->maxHealth_);
+        this->health_ = std::min(health, this->maxHealth_);
     }