From 7a6a56b7b1c10a29162b5ed8e6628a2f44403351 Mon Sep 17 00:00:00 2001
From: Magnus <magnus_ak@users.sourceforge.net>
Date: Fri, 6 Jan 2006 02:19:28 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1799 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 quakec/fallout2/client.qc  | 2 +-
 quakec/fallout2/weapons.qc | 3 +++
 quakec/fallout2/wizard.qc  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/quakec/fallout2/client.qc b/quakec/fallout2/client.qc
index 936dacd83..4c874e964 100644
--- a/quakec/fallout2/client.qc
+++ b/quakec/fallout2/client.qc
@@ -860,7 +860,7 @@ void() PlayerDeathThink =
 	local float             forward;
 
 	self.modelindex = modelindex_dead;
-
+	self.solid = SOLID_NOT;
 
 	if ((self.flags & FL_ONGROUND))
 	{
diff --git a/quakec/fallout2/weapons.qc b/quakec/fallout2/weapons.qc
index 650a8a65a..73727c0d0 100644
--- a/quakec/fallout2/weapons.qc
+++ b/quakec/fallout2/weapons.qc
@@ -783,7 +783,10 @@ void() spike_touch =
 	{
 		WriteByte (MSG_MULTICAST, SVC_TEMPENTITY);
 		if (self.classname == "wizspike")
+		{
+			T_Damage (other, self, self.owner, 9+random()18);
 			WriteByte (MSG_MULTICAST, TE_WIZSPIKE);
+		}
 		else if (self.classname == "knightspike")
 			WriteByte (MSG_MULTICAST, TE_KNIGHTSPIKE);
 		else
diff --git a/quakec/fallout2/wizard.qc b/quakec/fallout2/wizard.qc
index 62415b38a..b2047fffd 100644
--- a/quakec/fallout2/wizard.qc
+++ b/quakec/fallout2/wizard.qc
@@ -325,7 +325,7 @@ void()	wiz_death1	=[	$death1,		wiz_death2	] {
 self.velocity_x = -200 + 400*random();
 self.velocity_y = -200 + 400*random();
 self.velocity_z = 100 + 100*random();
-self.flags = self.flags - (self.flags & FL_ONGROUND);
+self.movetype = MOVETYPE_TOSS;
 sound (self, CHAN_VOICE, "wizard/wdeath.wav", 1, ATTN_NORM);
 };
 void()	wiz_death2	=[	$death2,		wiz_death3	] {};
@@ -346,6 +346,8 @@ void() wiz_die =
 		ThrowGib ("progs/gib2.mdl", -10);
 		ThrowGib ("progs/gib2.mdl", -10);
 		ThrowGib ("progs/gib2.mdl", -10);
+		ThrowGib ("progs/gib3.mdl", -10);
+		ThrowGib ("progs/gib1.mdl", -10);
 		return;
 	}