From: Mario Date: Sat, 12 Oct 2013 22:58:41 +0000 (+1100) Subject: Fix shambler lightning bolt client prediction X-Git-Tag: xonotic-v0.8.0~241^2^2~41 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e50b090d3df63ab42df5d1f97cf57ffeec08240;p=xonotic%2Fxonotic-data.pk3dir.git Fix shambler lightning bolt client prediction --- diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc index f11a94f8a..658f7b5b0 100644 --- a/qcsrc/client/projectile.qc +++ b/qcsrc/client/projectile.qc @@ -411,8 +411,6 @@ void Ent_Projectile() case PROJECTILE_SHAMBLER_LIGHTNING: self.mins = '-8 -8 -8'; self.maxs = '8 8 8'; - self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = func_null; self.scale = 2.5; self.avelocity = randomvec() * 720; break; diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc index 7994f106a..d3e4504fe 100644 --- a/qcsrc/common/monsters/monster/shambler.qc +++ b/qcsrc/common/monsters/monster/shambler.qc @@ -74,14 +74,13 @@ void shambler_lightning_explode() self.takedamage = DAMAGE_NO; self.movetype = MOVETYPE_NONE; self.velocity = '0 0 0'; - UpdateCSQCProjectile(self); if(self.movetype == MOVETYPE_NONE) self.velocity = self.oldvelocity; RadiusDamage (self, self.realowner, MON_CVAR(shambler, attack_lightning_damage), MON_CVAR(shambler, attack_lightning_damage), MON_CVAR(shambler, attack_lightning_radius), world, MON_CVAR(shambler, attack_lightning_force), self.projectiledeathtype, other); - for(head = findradius(self.origin, MON_CVAR(shambler, attack_lightning_radius_zap)); head; head = head.chain) if(head != self.realowner) + for(head = findradius(self.origin, MON_CVAR(shambler, attack_lightning_radius_zap)); head; head = head.chain) if(head != self.realowner) if(head.takedamage) { te_csqc_lightningarc(self.origin, head.origin); Damage(head, self, self.realowner, MON_CVAR(shambler, attack_lightning_damage) * Monster_SkillModifier(), DEATH_MONSTER_SHAMBLER_ZAP, head.origin, '0 0 0');