Changeset 8228 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jun 8, 2006, 11:19:08 AM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk with command: svn merge branches/network trunk -r8150:HEAD

Location:

trunk/src/story_entities

Files:

• multi_player_world.cc (modified) (2 diffs)
• multi_player_world.h (modified) (1 diff)

trunk/src/story_entities/multi_player_world.cc

@@ -26 +26 @@
 
 #include "network_manager.h"
+#include "network_game_manager.h"
 
 
@@ -119 +120 @@
   ((MultiPlayerWorldData*)this->dataTank)->debug();
 }
+
+/**
+ * cleanup
+ * @return 
+ */
+ErrorMessage MultiPlayerWorld::unloadData( )
+{
+    
+  GameWorld::unloadData();
+  
+  delete NetworkManager::getInstance();
+  delete NetworkGameManager::getInstance();
+
+}

trunk/src/story_entities/multi_player_world.h

@@ -26 +26 @@
 
   virtual void loadParams(const TiXmlElement* root);
+  
+  virtual ErrorMessage unloadData();
 
   void debug();