X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=5d9436f684ea4c3b87c2b1dcd6587b3bd214ceeb;hb=09dae4a483fc31bc94a2c19922c3fd0d1c7951e3;hp=343be952ca39fa97bfd0b8e20dda2103781eaa94;hpb=1d70346809dd33b32864b3832662878077588e4b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 343be952c..5d9436f68 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -24,46 +24,6 @@ #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/common.qh" -bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf) -{ - WriteHeader(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO); - WriteShort(MSG_ENTITY, self.projectiledeathtype); - WriteCoord(MSG_ENTITY, floor(self.origin.x)); - WriteCoord(MSG_ENTITY, floor(self.origin.y)); - WriteCoord(MSG_ENTITY, floor(self.origin.z)); - WriteByte(MSG_ENTITY, bound(1, self.dmg, 255)); - WriteByte(MSG_ENTITY, bound(0, self.dmg_radius, 255)); - WriteByte(MSG_ENTITY, bound(1, self.dmg_edge, 255)); - WriteShort(MSG_ENTITY, self.oldorigin.x); - WriteByte(MSG_ENTITY, self.species); - return true; -} - -void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, int deathtype, float bloodtype, entity dmgowner) -{ - // TODO maybe call this from non-edgedamage too? - // TODO maybe make the client do the particle effects for the weapons and the impact sounds using this info? - - entity e; - - if(!sound_allowed(MSG_BROADCAST, dmgowner)) - deathtype |= 0x8000; - - e = new(damageinfo); - make_pure(e); - setorigin(e, org); - e.projectiledeathtype = deathtype; - e.dmg = coredamage; - e.dmg_edge = edgedamage; - e.dmg_radius = rad; - e.dmg_force = vlen(force); - e.velocity = force; - e.oldorigin_x = compressShortVector(e.velocity); - e.species = bloodtype; - - Net_LinkEntity(e, false, 0.2, Damage_DamageInfo_SendEntity); -} - void UpdateFrags(entity player, float f) { PlayerTeamScore_AddScore(player, f);