Changeset 1556

Timestamp:

Jun 6, 2008, 9:18:04 PM (17 years ago)

Author:

landauf

Message:

now it's tested on tardis… fixed a small typo.\n additionally removed two warnings in server.cc and orxonox.cc

Location:

code/trunk/src

Files:

• core/input/InputInterfaces.h (modified) (1 diff)
• network/Server.cc (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (1 diff)

code/trunk/src/core/input/InputInterfaces.h

@@ -39 +39 @@
 #include "src/ois/OISKeyboard.h"
 #include "src/ois/OISMouse.h"
-#include "src/ois/OISJoystick.h"
+#include "src/ois/OISJoyStick.h"
 #include "util/Math.h"
 

code/trunk/src/network/Server.cc

@@ -220 +220 @@
             COUT(3) << "Server: could not elaborate" << std::endl;
         }
+        break;
+      default:
         break;
       }

code/trunk/src/orxonox/Orxonox.cc

@@ -417 +417 @@
     float renderTime = 0.0f;
     float frameTime = 0.0f;
-    clock_t time = 0;
+//    clock_t time = 0;
 
     //Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();