Fix compile errors

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 1ea2615eadc2e846e807fd074b13fc6954e32e61..98f2d2f59986d0dbe203046b9f90db4a83f09255 100644 (file)
--- 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 859e52ae0a1614cc941455d77eefc4f9122efb27..77f615788c562f60bf3d00f48f53ac5293661206 100644 (file)
--- 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 041ed3caf91fb714499aedf1bf90aace4ed868e1..ce166f3c3b25da5fb2d09fefa27c99bb6bb3988c 100644 (file)
--- 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)