Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / damage.qh

diff --git a/qcsrc/server/damage.qh b/qcsrc/server/damage.qh
index 7284f8c19f53f1250c1792fb015fe428089b5408..3d6e024812ba4790abebe702e83b793d5af27d3f 100644 (file)
--- a/qcsrc/server/damage.qh
+++ b/qcsrc/server/damage.qh
@@ -49,8 +49,7 @@ float checkrules_firstblood;
 .float damagedbytriggers;
 
 float yoda;
-float damage_goodhits;
-float damage_gooddamage;
+int impressive_hits;
 
 .float pain_finished; // Added by Supajoe
 
@@ -144,21 +143,14 @@ const float MAX_DAMAGEEXTRARADIUS = 16;
 bool Heal(entity targ, entity inflictor, float amount, float limit);
 
 .float fire_damagepersec;
-.float fire_endtime;
 .float fire_deathtype;
 .entity fire_owner;
 .float fire_hitsound;
 .entity fire_burner;
 
-void fireburner_think(entity this);
-
-float Fire_IsBurning(entity e);
-
 float Fire_AddDamage(entity e, entity o, float d, float t, float dt);
 
 void Fire_ApplyDamage(entity e);
 
-void Fire_ApplyEffect(entity e);
-
 IntrusiveList g_damagedbycontents;
 STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }