Merge branch 'Mario/monster_lod_models' into 'master'

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

diff --git a/qcsrc/server/damage.qh b/qcsrc/server/damage.qh
index 7284f8c19f53f1250c1792fb015fe428089b5408..cc4dd30a581ebba88ff62674970b2374c716759b 100644 (file)
--- a/qcsrc/server/damage.qh
+++ b/qcsrc/server/damage.qh
@@ -41,7 +41,7 @@ float autocvar_g_frozen_force;
 
 bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf);
 
-void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, int deathtype, float bloodtype, entity dmgowner);
+void Damage_DamageInfo(vector org, bool is_solid_hit, float coredamage, float edgedamage, float rad, vector force, int deathtype, float bloodtype, entity dmgowner);
 
 float checkrules_firstblood;
 
@@ -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
 
@@ -70,7 +69,8 @@ float damage_gooddamage;
 
 .vector death_origin;
 
-.float damage_dealt, typehitsound, killsound;
+.float hitsound_damage_dealt;
+.int typehitsound, killsound;
 
 // used for custom deathtype
 string deathmessage;
@@ -135,7 +135,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
 float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, int deathtype, .entity weaponentity, entity directhitentity);
 
 .float damageforcescale;
-const float MIN_DAMAGEEXTRARADIUS = 2;
+const float MIN_DAMAGEEXTRARADIUS = 0.1;
 const float MAX_DAMAGEEXTRARADIUS = 16;
 .float damageextraradius;
 
@@ -144,21 +144,13 @@ 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(); }