diff --git a/src/client/game_event.qc b/src/client/game_event.qc
index 37d101d..2b423b4 100644
--- a/src/client/game_event.qc
+++ b/src/client/game_event.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-void
+int
 ClientGame_EventParse(float fHeader)
 {
 switch (fHeader) {
@@ -132,5 +132,8 @@ switch (fHeader) {
 	case EV_RADIOMSG2:
 		Radio_PlayPlayerMessage(readbyte(), readbyte());
 		break;
+	default:
+		return (0);
 	}
+	return (1);
 }
diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index e242b26..8dc477c 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -19,7 +19,7 @@ CSMultiplayerRules::MaxItemPerSlot(int slot)
 {
 	/* grenades */
 	if (slot == 3) {
-		return 3;
+		return (3);
 	}
 	return (1);
 }
@@ -79,12 +79,8 @@ CSMultiplayerRules::PlayerDeath(base_player pl)
 
 	/* clear all ammo and inventory... */
 	PlayerClearWeaponry(targ);
-	targ.movetype = MOVETYPE_NONE;
-	targ.solid = SOLID_NOT;
-	targ.takedamage = DAMAGE_NO;
+	targ.Death();
 	targ.gflags &= ~GF_FLASHLIGHT;
-	targ.armor = 0;
-	targ.health = 0;
 
 	/* gamerule stuff */
 	static void GoSpec(void) {