Changeset 918 for code/branches/network/src/orxonox/Orxonox.cc

Timestamp:

Mar 22, 2008, 9:17:34 PM (16 years ago)

Author:

rgrieder

Message:

• created basic construct for the InputHandler (mere copy of InputManager but without the Listeners)
• some msvc related fixes with winsocks.h and winsocks2.h
• fix in Tickable.h (due to lazy displacement to new folder)

File:

• code/branches/network/src/orxonox/Orxonox.cc (modified) (3 diffs)

code/branches/network/src/orxonox/Orxonox.cc

@@ -64 +64 @@
 #include "network/Server.h"
 #include "network/Client.h"
-#include "network/NetworkPrereqs.h"
 network::Client *client_g;
 network::Server *server_g;
@@ -79 +78 @@
 #include "hud/HUD.h"
 #include "objects/weapon/BulletManager.h"
-#include "GraphicsEngine.h"
 
 #include "Orxonox.h"
@@ -434 +432 @@
   /**
     Main loop of the orxonox game.
-    This is a new solution, using the ogre engine instead of beeing used by it.
+    This is a new solution, using the ogre engine instead of being used by it.
     An alternative solution would be to simply use the timer of the Root object,
     but that implies using Ogre in any case. There would be no way to test