Changeset 3262 for code/branches/core4/src/orxonox/overlays

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/overlays/console/InGameConsole.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/overlays/console/InGameConsole.cc

@@ -30 +30 @@
 #include "InGameConsole.h"
 
+#include <algorithm>
 #include <string>
 #include <OgreOverlay.h>
@@ -425 +426 @@
 
         if (LINES > 0)
-            this->maxCharsPerLine_ = max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
+            this->maxCharsPerLine_ = std::max((unsigned int)10, (unsigned int) ((float)this->desiredTextWidth_ / CHAR_WIDTH));
         else
             this->maxCharsPerLine_ = 10;