Changeset 1910 for code/trunk

Timestamp:

Oct 12, 2008, 8:57:39 PM (16 years ago)

Author:

scheusso

Message:

reverted a change in ogre.cfg-init

Location:

code/trunk

Files:

• bin/ogre.cfg-init (modified) (1 diff)
• src/network/Synchronisable.h (modified) (1 diff)
• src/orxonox/gamestates/GSServer.cc (modified) (1 diff)

code/trunk/bin/ogre.cfg-init

@@ -4 +4 @@
 FSAA=0
 Full Screen=No
-RTT Preferred Mode=PBuffer
-Video Mode=640 x 480
+RTT Preferred Mode=FBO
+Video Mode=1024 x 768

code/trunk/src/network/Synchronisable.h

@@ -39 +39 @@
 #include "core/XMLIncludes.h"
 #include "NetworkCallback.h"
+#include "util/Integers.h"
 
 #define REGISTERDATA(varname) registerVar(&varname, sizeof(varname), network::DATA)

code/trunk/src/orxonox/gamestates/GSServer.cc

@@ -83 +83 @@
         this->server_->close();
         delete this->server_;
-        Settings::_getInstance().bHasServer_ = false;
 
         GSLevel::leave();
+        
+        Settings::_getInstance().bHasServer_ = false;
     }