Changeset 8120 in orxonox.OLD for branches/network/src/lib

Timestamp:

Jun 2, 2006, 4:19:10 PM (18 years ago)

Author:

rennerc

Message:

spectator movement works now
old Playables will be deleted
teamchoice random works now

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (2 diffs)
• network_game_manager.h (modified) (3 diffs)
• network_manager.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -161 +161 @@
     {
       if ( (*it)->isA(CL_PLAYABLE) )
+      {
+        getInstance()->playablesToDelete.push_back( dynamic_cast<Playable*>(*it) );
         return true;
+      }
         
       delete dynamic_cast<Synchronizeable*>(*it);
@@ -238 +241 @@
 }
 
-
-
-
+/**
+ * this function will be called periodically by networkManager
+ * @param ds time elapsed since last call of tick
+ */
+void NetworkGameManager::tick( float ds )
+{
+  //delete playables if they are not assigned to local player anymore
+  for ( std::list<Playable*>::iterator it = playablesToDelete.begin(); it != playablesToDelete.end();  )
+  {
+    if ( State::getPlayer()->getPlayable() != *it )
+    {
+      PRINTF(0)("Delete unused playable: %s owner: %d\n", (*it)->getClassName(), (*it)->getOwner() );
+      std::list<Playable*>::iterator delit = it;
+      it++;
+      delete *delit;
+      playablesToDelete.erase( delit );
+      continue;
+    }
+    it++;
+  }
+}
+
+
+
+

branches/network/src/lib/network/network_game_manager.h

@@ -12 +12 @@
 /* include base_object.h since all classes are derived from this one */
 #include "synchronizeable.h"
+#include "playable.h"
 #include "message_manager.h"
 
@@ -61 +62 @@
     inline void setGameState( int gameState ){ this->gameState = gameState; }
     inline int getGameState(){ return this->gameState; }
+    
+    void tick( float ds );
 
   private:
@@ -73 +76 @@
     
     int                           gameState;
+    
+    std::list<Playable*>          playablesToDelete;
 };
 

branches/network/src/lib/network/network_manager.cc

@@ -30 +30 @@
 #include "preferences.h"
 #include "network_log.h"
+#include "network_game_manager.h"
 
 
@@ -149 +150 @@
         static_cast<NetworkStream*>(*stream)->processData();
   }
+  
+  NetworkGameManager::getInstance()->tick( this->elapsedTime );
 }