X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fspider.qc;h=b9f9bfc21c2992807c513abaf5cd0c7649720138;hb=490a31934aa67cc7de5299a4d3f625d5271f8583;hp=0b2e3650b4c3cdf23d86008393709646af99614d;hpb=a5357242d8541b890aa0f11e647669c7c3efb2df;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index 0b2e3650b..b9f9bfc21 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -156,14 +156,14 @@ void M_Spider_Attack_Web_Explode_use(entity this, entity actor, entity trigger) WITHSELF(this, M_Spider_Attack_Web_Explode()); } -void M_Spider_Attack_Web_Touch() +void M_Spider_Attack_Web_Touch(entity this) { - PROJECTILE_TOUCH; + PROJECTILE_TOUCH(this); M_Spider_Attack_Web_Explode(); } -void adaptor_think2use_hittype_splash(); +void adaptor_think2use_hittype_splash(entity this); void M_Spider_Attack_Web(entity this) { @@ -174,7 +174,7 @@ void M_Spider_Attack_Web(entity this) entity proj = new(plasma); proj.owner = proj.realowner = this; proj.use = M_Spider_Attack_Web_Explode_use; - proj.think = adaptor_think2use_hittype_splash; + setthink(proj, adaptor_think2use_hittype_splash); proj.bot_dodge = true; proj.bot_dodgerating = 0; proj.nextthink = time + 5; @@ -186,7 +186,7 @@ void M_Spider_Attack_Web(entity this) //proj.glow_color = 45; proj.movetype = MOVETYPE_BOUNCE; W_SetupProjVelocity_Explicit(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, false); - proj.touch = M_Spider_Attack_Web_Touch; + settouch(proj, M_Spider_Attack_Web_Touch); setsize(proj, '-4 -4 -4', '4 4 4'); proj.takedamage = DAMAGE_NO; proj.damageforcescale = 0;