Changeset 917 for code/branches/network/src/orxonox/objects

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())

Location:

code/branches/network/src/orxonox/objects

Files:

• Tickable.cc (deleted)
• Tickable.h (deleted)
• WorldEntity.h (modified) (1 diff)
• weapon/BulletManager.h (modified) (1 diff)

code/branches/network/src/orxonox/objects/WorldEntity.h

@@ -12 +12 @@
 //#include "util/tinyxml/tinyxml.h"
 #include "core/BaseObject.h"
-#include "Tickable.h"
+#include "core/Tickable.h"
 #include "../tools/Mesh.h"
 

code/branches/network/src/orxonox/objects/weapon/BulletManager.h

@@ -39 +39 @@
 #include "util/tinyxml/tinyxml.h"
 #include "core/BaseObject.h"
-#include "../Tickable.h"
+#include "core/Tickable.h"
 
 namespace orxonox {