about summary refs log tree commit diff
path: root/src/game/server
diff options
context:
space:
mode:
authorJakob Fries <jakob.fries@gmail.com>2007-11-24 14:07:06 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-11-24 14:07:06 +0000
commit79d495233fa7f14c3ad5ad3e6c3db26220d2f2a3 (patch)
treeb1c1df5a3cb1685fe22f7a253f5d3404ddb11765 /src/game/server
parent51710edd8e8869a8233e7b8c4204e6b2e3fcbe42 (diff)
downloadzcatch-79d495233fa7f14c3ad5ad3e6c3db26220d2f2a3.tar.gz
zcatch-79d495233fa7f14c3ad5ad3e6c3db26220d2f2a3.zip
autoswitch weapons option
Diffstat (limited to 'src/game/server')
-rw-r--r--src/game/server/game_server.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 797f31bf..1ef23052 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -1189,6 +1189,9 @@ void powerup::reset()
 		spawntick = -1;
 }
 
+
+void send_weapon_pickup(int cid, int weapon);
+
 void powerup::tick()
 {
 	// wait for respawn
@@ -1245,6 +1248,8 @@ void powerup::tick()
 						create_sound(pos, SOUND_PICKUP_ROCKET);
 					else if(subtype == WEAPON_SHOTGUN)
 						create_sound(pos, SOUND_PICKUP_SHOTGUN);
+
+                    send_weapon_pickup(pplayer->client_id, subtype);
 				}
 			}
 			break;
@@ -1537,6 +1542,14 @@ void send_emoticon(int cid, int emoticon)
 	server_send_msg(-1);
 }
 
+void send_weapon_pickup(int cid, int weapon)
+{
+	msg_pack_start(MSG_WEAPON_PICKUP, MSGFLAG_VITAL);
+	msg_pack_int(weapon);
+	msg_pack_end();
+	server_send_msg(cid);
+}
+
 void mods_client_enter(int client_id)
 {
 	world->insert_entity(&players[client_id]);