X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qh;h=ca5c45b9efd3c01282d965cd812abd15b64c8cb2;hb=5e407e0d952589c8041fa4263e495dc09116e8db;hp=4cc3f6f63e901d05e4fc863ad89ca76ce5606144;hpb=253cc10990569fd90917dba809ce03c90fc89336;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index 4cc3f6f63..ca5c45b9e 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -1,30 +1,27 @@ -#ifndef G_DAMAGE_H -#define G_DAMAGE_H +#pragma once #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../dpdefs/progsdefs.qh" - #include "../dpdefs/dpextensions.qh" - #include "../warpzonelib/common.qh" - #include "../common/constants.qh" - #include "../common/teams.qh" - #include "../common/util.qh" - #include "../common/weapons/weapons.qh" + #include + #include + #include + #include + #include #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" - #include "t_items.qh" + #include #include "autocvars.qh" #include "constants.qh" #include "defs.qh" - #include "../common/notifications.qh" - #include "../common/deathtypes.qh" - #include "mutators/mutators_include.qh" - #include "tturrets/include/turrets_early.qh" - #include "vehicles/vehicles_def.qh" - #include "../csqcmodellib/sv_model.qh" - #include "../common/playerstats.qh" + #include + #include + #include "mutators/all.qh" + #include + #include + #include + #include #include "g_hook.qh" #include "scores.qh" #include "spawnpoints.qh" @@ -35,9 +32,9 @@ .float dmg_force; .float dmg_radius; -float Damage_DamageInfo_SendEntity(entity to, float sf); +bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf); -void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, float deathtype, float bloodtype, entity dmgowner); +void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, int deathtype, float bloodtype, entity dmgowner); float checkrules_firstblood; @@ -58,18 +55,18 @@ float IsFlying(entity a); void UpdateFrags(entity player, float f); // NOTE: f=0 means still count as a (positive) kill, but count no frags for it -void W_SwitchWeapon_Force(entity e, float w); +void W_SwitchWeapon_Force(Player this, Weapon w); entity GiveFrags_randomweapons; -void GiveFrags (entity attacker, entity targ, float f, float deathtype); +void GiveFrags (entity attacker, entity targ, float f, int deathtype); string AppendItemcodes(string s, entity player); -void LogDeath(string mode, float deathtype, entity killer, entity killed); +void LogDeath(string mode, int deathtype, entity killer, entity killed); void Obituary_SpecialDeath( entity notif_target, float murder, - float deathtype, + int deathtype, string s1, string s2, string s3, float f1, float f2, float f3); @@ -77,11 +74,11 @@ float w_deathtype; float Obituary_WeaponDeath( entity notif_target, float murder, - float deathtype, + int deathtype, string s1, string s2, string s3, float f1, float f2); -void Obituary(entity attacker, entity inflictor, entity targ, float deathtype); +void Obituary(entity attacker, entity inflictor, entity targ, int deathtype); void Ice_Think(); @@ -94,13 +91,13 @@ entity damage_targ; entity damage_inflictor; entity damage_attacker; -void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force); +void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force); float RadiusDamage_running; -float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector inflictorvelocity, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float inflictorselfdamage, float forceintensity, float deathtype, entity directhitentity); +float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector inflictorvelocity, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float inflictorselfdamage, float forceintensity, int deathtype, entity directhitentity); // Returns total damage applies to creatures -float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, float deathtype, entity directhitentity); +float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, int deathtype, entity directhitentity); .float fire_damagepersec; .float fire_endtime; @@ -120,4 +117,3 @@ void Fire_ApplyDamage(entity e); void Fire_ApplyEffect(entity e); void fireburner_think(); -#endif