Changeset 6196 for code/branches/presentation2

Timestamp:

Dec 2, 2009, 2:42:56 PM (15 years ago)

Author:

landauf

Message:

fixed some warnings in IOConsole

Location:

code/branches/presentation2/src/libraries/core

Files:

• IOConsole.cc (modified) (3 diffs)
• IOConsole.h (modified) (1 diff)

code/branches/presentation2/src/libraries/core/IOConsole.cc

@@ -458 +458 @@
         , cout_(std::cout.rdbuf())
         , promptString_("orxonox # ")
+        , inputLineHeight_(1)
         , statusLines_(1)
-        , inputLineHeight_(1)
         , lastOutputLineHeight_(0)
     {
@@ -684 +684 @@
     void IOConsole::createNewOutputLines(int lines)
     {
-        CHAR_INFO fillChar = {' ', FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED};
+        CHAR_INFO fillChar = {{' '}, FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED};
         // Lines to scroll input/status down (if possible)
         int linesDown = clamp(terminalHeight_ - inputLineRow_ - inputLineHeight_ - statusLines_, 0, lines);
@@ -732 +732 @@
             int statusLineRow = this->inputLineRow_ + this->inputLineHeight_;
             SMALL_RECT oldRect = {0, statusLineRow, this->terminalWidth_ - 1, statusLineRow + this->statusLines_};
-            CHAR_INFO fillChar = {' ', FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED};
+            CHAR_INFO fillChar = {{' '}, FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED};
             ScrollConsoleScreenBuffer(stdOutHandle_, &oldRect, NULL, makeCOORD(0, statusLineRow + newLines), &fillChar);
             // Clear potential leftovers

code/branches/presentation2/src/libraries/core/IOConsole.h

@@ -43 +43 @@
 #elif defined(ORXONOX_PLATFORM_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif