Changeset 3284

Timestamp:

Jul 13, 2009, 6:03:24 PM (15 years ago)

Author:

rgrieder

Message:

Move resource allocation to the corresponding thread and made compiler directives clearer.

File:

• code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc (modified) (8 diffs)

code/branches/netp6/src/orxonox/gamestates/GSDedicated.cc

@@ -42 +42 @@
 #include <boost/bind.hpp>
 
-#ifndef ORXONOX_PLATFORM_WINDOWS
+#ifdef ORXONOX_PLATFORM_UNIX
 #include <termios.h>
 #endif
@@ -65 +65 @@
         , cursorY_(0)
     {
-        this->commandLine_ = new unsigned char[MAX_COMMAND_LENGTH];
-//         memset( this->commandLine_, 0, MAX_COMMAND_LENGTH );
     }
 
@@ -96 +94 @@
         
         closeThread_ = true;
-#ifndef ORXONOX_PLATFORM_WINDOWS
+#ifdef ORXONOX_PLATFORM_UNIX
         std::cout << "\033[0G\033[K";
         std::cout.flush();
@@ -105 +103 @@
         inputThread_->join();
         delete this->inputThread_;
-
-        if (this->commandLine_ )
-          delete[] this->commandLine_;
 
         GameMode::setHasServer(false);
@@ -132 +127 @@
     void GSDedicated::inputThread()
     {
+        this->commandLine_ = new unsigned char[MAX_COMMAND_LENGTH];
+//         memset( this->commandLine_, 0, MAX_COMMAND_LENGTH );
         unsigned char c;
         unsigned int  escapeChar=0;
@@ -213 +210 @@
             }
         }
+
+        delete[] this->commandLine_;
     }
     
     void GSDedicated::printLine()
     {
-#ifndef ORXONOX_PLATFORM_WINDOWS
+#ifdef ORXONOX_PLATFORM_UNIX
         // set cursor to the begining of the line and erase the line
         std::cout << "\033[0G\033[K";
@@ -257 +256 @@
     void GSDedicated::setTerminalMode()
     {
-#ifndef ORXONOX_PLATFORM_WINDOWS
+#ifdef ORXONOX_PLATFORM_UNIX
         termios new_settings;
      
@@ -274 +273 @@
     void GSDedicated::resetTerminalMode()
     {
-#ifndef ORXONOX_PLATFORM_WINDOWS
+#ifdef ORXONOX_PLATFORM_UNIX
         tcsetattr(0, TCSANOW, GSDedicated::originalTerminalSettings_);
 #endif