Changeset 917 for code/branches/network/src/orxonox/OrxonoxStableHeaders.h

Timestamp:

Mar 21, 2008, 6:14:31 PM (17 years ago)

Author:

rgrieder

Message:

• merged all changes in the input branch into this one
• moved Tickable to core (would have created circular library dependencies)
• exported OrxListener to a separate file, soon to be deleted

changed

, &&, XOR back to or, and, xor because I found the necessary include file for VC++

• created abortRequest() in Orxonox.cc to call for a smooth end of the game (an alternative would be to make tick() return a boolean, like it is with frameStarted())

File:

• code/branches/network/src/orxonox/OrxonoxStableHeaders.h (modified) (3 diffs)

code/branches/network/src/orxonox/OrxonoxStableHeaders.h

@@ -73 +73 @@
 //#include "audio/AudioManager.h"
 
-//#include "core/CoreIncludes.h"
+#include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
 //#include "core/ArgReader.h"
 #include "core/Error.h"
+#include "core/Loader.h"
+#include "core/XMLPort.h"
+#include "core/Tickable.h"
 
 #include "network/Synchronisable.h"
@@ -87 +90 @@
 #include "util/String2Number.h"
 #include "util/Tokenizer.h"
+#include "util/Multitype.h"
+#include "util/MultiTypeMath.h"
+#include "util/MultiTypePrimitive.h"
+#include "util/MultiTypeString.h"
+#include "util/substring.h"
+#include "util/XMLIncludes.h"
+
 #include "util/tinyxml/ticpp.h"
 #include "util/tinyxml/tinyxml.h"
@@ -106 +116 @@
 //#include "objects/Skybox.h"
 //#include "objects/SpaceShipSteeringObject.h"
-#include "objects/Tickable.h"
 #include "objects/WorldEntity.h"
 //#include "particle/ParticleInterface.h"