Changeset 8024 in orxonox.OLD

Timestamp:

May 31, 2006, 2:04:13 PM (18 years ago)

Author:

rennerc

Message:

added two missing files

Location:

branches/network/src

Files:

• lib/network/message_manager.h (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.h (modified) (2 diffs)
• util/network_game_rules.cc (added)
• util/network_game_rules.h (added)
• util/signal_handler.cc (modified) (2 diffs)

branches/network/src/lib/network/message_manager.h

@@ -28 +28 @@
 enum MessageId 
 {
-  TESTMESSAGEID = 1
+  TESTMESSAGEID = 1,
+  MSGID_DELETESYNCHRONIZEABLE
 };
 

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

@@ -57 +57 @@
 
   this->setSynchronized(true);
-
+  
+  MessageManager::getInstance()->registerMessageHandler( MSGID_DELETESYNCHRONIZEABLE, delSynchronizeableHandler, NULL );
 }
 
@@ -121 +122 @@
 
 
+/**
+ * handler for remove synchronizeable messages
+ * @param messageId 
+ * @param data 
+ * @param dataLength 
+ * @param someData 
+ * @param userId 
+ * @return true on successfull handling else handler will be called again
+ */
+bool NetworkGameManager::delSynchronizeableHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+{
+  if ( getInstance()->isServer() )
+  {
+    PRINTF(2)("Recieved DeleteSynchronizeable message from client %d!\n", userId);
+    return true;
+  }
+  
+  int uniqueId = 0;
+  int len = Converter::byteArrayToInt( data, &uniqueId );
+  
+  if ( len != dataLength )
+  {
+    PRINTF(2)("Recieved DeleteSynchronizeable message with incorrect size (%d) from client %d!\n", dataLength, userId);
+    return true;
+  }
+  
+  const std::list<BaseObject*> * list = ClassList::getList( CL_SYNCHRONIZEABLE );
+  
+  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
+  {
+    if ( dynamic_cast<Synchronizeable*>(*it)->getUniqueID() == uniqueId )
+    {
+      delete dynamic_cast<Synchronizeable*>(*it);
+      return true;
+    }
+  }
+}
+
+/**
+ * removes synchronizeable (also on clients)
+ * @param uniqueId uniqueid to delete
+ */
+void NetworkGameManager::removeSynchronizeable( int uniqueId )
+{
+}
 
 
 
 
+

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

@@ -52 +52 @@
 
 
-    bool signalNewPlayer(int userId);
-    bool signalLeftPlayer(int userID);
+    bool signalNewPlayer( int userId );
+    bool signalLeftPlayer( int userID );
+    
+    void removeSynchronizeable( int uniqueId );
 
 
@@ -59 +61 @@
     NetworkGameManager();
     
-    static bool youAreHandler(MessageId messageId, byte * data, int dataLength, void * someData, int userId );
+    static bool delSynchronizeableHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
 
     static NetworkGameManager*    singletonRef;

branches/network/src/util/signal_handler.cc

@@ -81 +81 @@
   assert( pid != -1 );
 
+
   if ( pid == 0 )
   {
     getInstance()->dontCatch();
-
+    
     sleep(2);
-
 
     return;
@@ -92 +92 @@
   else
   {
+    getInstance()->dontCatch();
     if ( getInstance()->type == GDB_RUN_WRITE_TO_FILE && fork() == 0 )
     {