Changeset 9008 in orxonox.OLD for trunk/src/util/multiplayer_team_deathmatch.h

Timestamp:

Jul 2, 2006, 2:22:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:

• trunk/src/util/multiplayer_team_deathmatch.h (modified) (1 diff)

trunk/src/util/multiplayer_team_deathmatch.h

@@ -56 +56 @@
     virtual void process(const Event &event);
     
-    void onKill( int killedUserId, int userId );
+    void onKill( WorldEntity * victim, WorldEntity * killer );
     void onRespawn( int userId );
     
     virtual void handleChatMessage( int userId, const std::string & message, int messageType );
+    
+    void respawnPlayable( Playable * playable, int teamId, float delay );
 
   protected: