X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_nades.qc;h=8f7857b166846d58df78307e02a7eea8f444dd60;hb=1aac6cbd00e98ca537937fdc9490216a50cf3caa;hp=ce6ee85cda6833305133f73913f316714720392c;hpb=1e10293f61aa931855a209297294500b0f1740ab;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index ce6ee85cd..8f7857b16 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -475,7 +475,7 @@ void nade_monster_boom()
 void nade_boom()
 {
 	string expef;
-	float nade_blast = 1;
+	bool nade_blast = true;
 
 	switch ( self.nade_type )
 	{
@@ -484,16 +484,16 @@ void nade_boom()
 			expef = "explosion_medium";
 			break;
 		case NADE_TYPE_ICE:
-			nade_blast = 0;
+			nade_blast = false;
 			expef = "electro_combo"; // hookbomb_explode electro_combo bigplasma_impact
 			break;
 		case NADE_TYPE_TRANSLOCATE:
-			nade_blast = 0;
+			nade_blast = false;
 			expef = "";
 			break;
 		case NADE_TYPE_MONSTER:
 		case NADE_TYPE_SPAWN:
-			nade_blast = 0;
+			nade_blast = false;
 			switch(self.realowner.team)
 			{
 				case NUM_TEAM_1: expef = "spawn_event_red"; break;
@@ -504,7 +504,7 @@ void nade_boom()
 			}
 			break;
 		case NADE_TYPE_HEAL:
-			nade_blast = 0;
+			nade_blast = false;
 			expef = "spawn_event_red";
 			break;
 
@@ -551,12 +551,12 @@ void nade_boom()
 
 void nade_touch()
 {
-	float is_weapclip = 0;
+	/*float is_weapclip = 0;
 	if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NODRAW)
 	if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NONSOLID))
 	if (!(trace_dphitcontents & DPCONTENTS_OPAQUE))
-		is_weapclip = 1;
-	if(ITEM_TOUCH_NEEDKILL() || is_weapclip)
+		is_weapclip = 1;*/
+	if(ITEM_TOUCH_NEEDKILL()) // || is_weapclip)
 	{
 		remove(self);
 		return;
@@ -583,7 +583,7 @@ void nade_beep()
 	self.nextthink = max(self.wait, time);
 }
 
-void nade_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void nade_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
 	if(ITEM_DAMAGE_NEEDKILL(deathtype))
 	{
@@ -683,7 +683,7 @@ void toss_nade(entity e, vector _velocity, float _time)
 	if (trace_startsolid)
 		setorigin(_nade, e.origin);
 
-	if(self.v_angle.x >= 70 && self.v_angle.x <= 110)
+	if(self.v_angle.x >= 70 && self.v_angle.x <= 110 && self.BUTTON_CROUCH)
 		_nade.velocity = '0 0 100';
 	else if(autocvar_g_nades_nade_newton_style == 1)
 		_nade.velocity = e.velocity + _velocity;