Changeset 708 for code/branches/FICN/src/network

Timestamp:

Dec 28, 2007, 10:30:29 PM (17 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

Location:

code/branches/FICN/src/network

Files:

• ClientConnection.cc (modified) (1 diff)
• NetworkFrameListener.h (modified) (1 diff)

code/branches/FICN/src/network/ClientConnection.cc

@@ -39 +39 @@
 #include "ClientConnection.h"
 
-#ifdef WIN32
-#include <windows.h>
-#define usleep(x) Sleep((x)/1000)
-#else
-#include <unistd.h>
-#endif
+#include "misc/Sleep.h"
 
 namespace network{

code/branches/FICN/src/network/NetworkFrameListener.h

@@ -14 +14 @@
 #define _NetworkFrameListener_H__
 
-#include "OgreFrameListener.h"
+#include <OgreFrameListener.h>
+
 #include "Server.h"
 #include "Client.h"