Changeset 6498 in orxonox.OLD for trunk/src/lib/network/network_game_manager.h

Timestamp:

Jan 11, 2006, 9:58:22 PM (20 years ago)

Author:

patrick

Message:

trunk: merged the network branche into the trunk

File:

• trunk/src/lib/network/network_game_manager.h (modified) (3 diffs)

trunk/src/lib/network/network_game_manager.h

@@ -74 +74 @@
     virtual void readDebug() const;
 
-    void createEntity( ClassID classID, int owner = 0 );
+    int createEntity( ClassID classID, int owner = 0 );
     BaseObject* createEntity(const TiXmlElement* element);
     void removeEntity( int uniqueID );
@@ -87 +87 @@
 
     void requestCreateEntity(ClassID classID);
-    void executeCreateEntity(ClassID classID, int uniqueID = 0, int owner = 0);
+    int executeCreateEntity(ClassID classID, int uniqueID = 0, int owner = 0);
 
     void requestRemoveEntity(int uniqueID);
@@ -100 +100 @@
 
     bool canCreateEntity(ClassID classID);
+
+    bool signalNewPlayer(int userId);
 
     void resizeBufferVector(int n);