about summary refs log tree commit diff
path: root/src/game/server/game_server.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-11-18 23:29:34 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-11-18 23:29:34 +0000
commitadb6b58e3c9e23e1d659497f0fb9b4542de1c7cf (patch)
treec39935cacd9b0425a1e9f9a2b5b506feef299923 /src/game/server/game_server.cpp
parent9be8a4c39d5be538f85c905cf5194962271296a4 (diff)
downloadzcatch-adb6b58e3c9e23e1d659497f0fb9b4542de1c7cf.tar.gz
zcatch-adb6b58e3c9e23e1d659497f0fb9b4542de1c7cf.zip
fixed score board stuff for CTF and improved kill messages for it aswell
Diffstat (limited to 'src/game/server/game_server.cpp')
-rw-r--r--src/game/server/game_server.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 241e3862..797f31bf 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -992,17 +992,18 @@ void player::tick_defered()
 
 void player::die(int killer, int weapon)
 {
-	gameobj->on_player_death(this, get_player(killer), weapon);
+	int mode_special = gameobj->on_player_death(this, get_player(killer), weapon);
 
-	dbg_msg("game", "kill killer='%d:%s' victim='%d:%s' weapon=%d",
+	dbg_msg("game", "kill killer='%d:%s' victim='%d:%s' weapon=%d special=%d",
 		killer, server_clientname(killer),
-		client_id, server_clientname(client_id), weapon);
+		client_id, server_clientname(client_id), weapon, mode_special);
 
 	// send the kill message
 	msg_pack_start(MSG_KILLMSG, MSGFLAG_VITAL);
 	msg_pack_int(killer);
 	msg_pack_int(client_id);
 	msg_pack_int(weapon);
+	msg_pack_int(mode_special);
 	msg_pack_end();
 	server_send_msg(-1);