Changeset 3262 for code/branches/core4/src/orxonox/objects/worldentities/Backlight.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/Backlight.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/objects/worldentities/Backlight.cc

@@ -29 +29 @@
 #include "Backlight.h"
 
+#include <algorithm>
 #include <OgreRibbonTrail.h>
 #include <OgreSceneManager.h>
@@ -175 +176 @@
     void Backlight::stopturnonoff()
     {
-        this->postprocessingtime_ = max(0.0f, this->lifetime_ - this->turnofftime_);
+        this->postprocessingtime_ = std::max(0.0f, this->lifetime_ - this->turnofftime_);
 
         FadingBillboard::stopturnonoff();