From: Mario <mario.mario@y7mail.com>
Date: Thu, 7 Mar 2013 06:39:49 +0000 (+1100)
Subject: Fix compile errors
X-Git-Tag: xonotic-v0.7.0~55^2~3^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9be371a9f3d7ea7031efc0bacff9501dd0113551;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compile errors
---

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 1ea2615ea..98f2d2f59 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -919,7 +919,7 @@ float autocvar_g_maxspeed;
 float autocvar_g_midair_shieldtime;
 #define autocvar_g_minstagib cvar("g_minstagib")
 float autocvar_g_minstagib_ammo_drop;
-float autocvar_g_minstagib_extralives;
+//float autocvar_g_minstagib_extralives;
 float autocvar_g_minstagib_speed_highspeed;
 #define autocvar_g_mirrordamage cvar("g_mirrordamage")
 #define autocvar_g_mirrordamage_virtual cvar("g_mirrordamage_virtual")
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 859e52ae0..77f615788 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -827,15 +827,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 							if(targ.classname == "player") // don't do this for vehicles
 							if(IsFlying(victim))
 								yoda = 1;
-
-<<<<<<< HEAD
-							if(deathtype & HITTYPE_HEADSHOT)
-								headshot = 1;
-=======
-							if(g_minstagib)
-							if(victim.items & IT_STRENGTH)
-								yoda = 1;
->>>>>>> master
 						}
 					}
 				}
diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 041ed3caf..ce166f3c3 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -16,10 +16,6 @@ void W_MinstaNex_Attack (void)
 	damage_goodhits = 0;
 	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, 0, WEP_MINSTANEX);
 
-	if(headshot)
-	{
-		AnnounceTo(self, "headshot");
-	}
 	if(damage_goodhits && self.minstanex_lasthit)
 	{
 		if(yoda && flying)