X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fspider.qc;h=b9f9bfc21c2992807c513abaf5cd0c7649720138;hb=490a31934aa67cc7de5299a4d3f625d5271f8583;hp=a25a89e7dde125194dedfe8124412ed8bc2edc20;hpb=1d0313b550f20ceef79a51c4c8a2029eb673d979;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index a25a89e7d..b9f9bfc21 100644
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -22,7 +22,7 @@ REGISTER_MONSTER(SPIDER, NEW(Spider)) {
 #endif
 }
 
-#include "../../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(SpiderAttack, PortoLaunch)
 /* flags     */ ATTRIB(SpiderAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
@@ -50,23 +50,25 @@ float autocvar_g_monster_spider_attack_web_delay;
 float autocvar_g_monster_spider_attack_bite_damage;
 float autocvar_g_monster_spider_attack_bite_delay;
 
-void M_Spider_Attack_Web();
+void M_Spider_Attack_Web(entity this);
 
 REGISTER_MUTATOR(spiderweb, true);
 
 MUTATOR_HOOKFUNCTION(spiderweb, PlayerPhysics)
 {
-	if (time >= self.spider_slowness)
+    SELFPARAM();
+	if (time >= this.spider_slowness)
 		return false;
-	PHYS_MAXSPEED(self) *= 0.5; // half speed while slow from spider
-	PHYS_MAXAIRSPEED(self) *= 0.5;
-	PHYS_AIRSPEEDLIMIT_NONQW(self) *= 0.5;
-	PHYS_AIRSTRAFEACCELERATE(self) *= 0.5;
+	PHYS_MAXSPEED(this) *= 0.5; // half speed while slow from spider
+	PHYS_MAXAIRSPEED(this) *= 0.5;
+	PHYS_AIRSPEEDLIMIT_NONQW(this) *= 0.5;
+	PHYS_AIRSTRAFEACCELERATE(this) *= 0.5;
 	return false;
 }
 
 MUTATOR_HOOKFUNCTION(spiderweb, MonsterMove)
 {
+    SELFPARAM();
 	if(time < self.spider_slowness)
 	{
 		monster_speed_run *= 0.5;
@@ -77,18 +79,23 @@ MUTATOR_HOOKFUNCTION(spiderweb, MonsterMove)
 
 MUTATOR_HOOKFUNCTION(spiderweb, PlayerSpawn)
 {
+    SELFPARAM();
 	self.spider_slowness = 0;
 	return false;
 }
 
 MUTATOR_HOOKFUNCTION(spiderweb, MonsterSpawn)
 {
+    SELFPARAM();
 	self.spider_slowness = 0;
 	return false;
 }
 
 SOUND(SpiderAttack_FIRE, W_Sound("electro_fire"));
-METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, .entity weaponentity, int fire)) {
+METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, .entity weaponentity, int fire))
+{
+    SELFPARAM();
+    TC(SpiderAttack, thiswep);
     bool isPlayer = IS_PLAYER(actor);
     if (fire & 1)
     if ((!isPlayer && time >= actor.spider_web_delay) || weapon_prepareattack(thiswep, actor, weaponentity, false, autocvar_g_monster_spider_attack_web_delay)) {
@@ -99,9 +106,9 @@ METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, .entity
 			actor.anim_finished = time + 1;
 		}
         if (isPlayer) actor.enemy = Monster_FindTarget(actor);
-        W_SetupShot_Dir(actor, v_forward, false, 0, SND(SpiderAttack_FIRE), CH_WEAPON_B, 0);
+        W_SetupShot_Dir(actor, v_forward, false, 0, SND_SpiderAttack_FIRE, CH_WEAPON_B, 0);
     	if (!isPlayer) w_shotdir = normalize((actor.enemy.origin + '0 0 10') - actor.origin);
-		M_Spider_Attack_Web();
+		M_Spider_Attack_Web(actor);
         weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, 0, w_ready);
         return;
     }
@@ -111,7 +118,7 @@ METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, .entity
     		actor.enemy = Monster_FindTarget(actor);
     		actor.attack_range = 60;
     	}
-    	Monster_Attack_Melee(actor.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? self.anim_melee : self.anim_shoot), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER.m_id, true);
+    	Monster_Attack_Melee(actor, actor.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? self.anim_melee : self.anim_shoot), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER.m_id, true);
         weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, 0, w_ready);
     }
 }
@@ -137,44 +144,49 @@ void M_Spider_Attack_Web_Explode()
 		Send_Effect(EFFECT_ELECTRO_IMPACT, self.origin, '0 0 0', 1);
 		RadiusDamage(self, self.realowner, 0, 0, 25, world, world, 25, self.projectiledeathtype, world);
 
-		for(e = findradius(self.origin, 25); e; e = e.chain) if(e != self) if(e.takedamage && e.deadflag == DEAD_NO) if(e.health > 0) if(e.monsterid != MON_SPIDER.monsterid)
+		for(e = findradius(self.origin, 25); e; e = e.chain) if(e != self) if(e.takedamage && !IS_DEAD(e)) if(e.health > 0) if(e.monsterid != MON_SPIDER.monsterid)
 			e.spider_slowness = time + (autocvar_g_monster_spider_attack_web_damagetime);
 
 		remove(self);
 	}
 }
 
-void M_Spider_Attack_Web_Touch()
+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(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()
-{SELFPARAM();
-	monster_makevectors(self.enemy);
+void M_Spider_Attack_Web(entity this)
+{
+	monster_makevectors(this, this.enemy);
 
-	sound(self, CH_SHOTS, SND_ELECTRO_FIRE2, VOL_BASE, ATTEN_NORM);
+	sound(this, CH_SHOTS, SND_ELECTRO_FIRE2, VOL_BASE, ATTEN_NORM);
 
 	entity proj = new(plasma);
-	proj.owner = proj.realowner = self;
-	proj.use = M_Spider_Attack_Web_Explode;
-	proj.think = adaptor_think2use_hittype_splash;
+	proj.owner = proj.realowner = this;
+	proj.use = M_Spider_Attack_Web_Explode_use;
+	setthink(proj, adaptor_think2use_hittype_splash);
 	proj.bot_dodge = true;
 	proj.bot_dodgerating = 0;
 	proj.nextthink = time + 5;
 	PROJECTILE_MAKETRIGGER(proj);
 	proj.projectiledeathtype = DEATH_MONSTER_SPIDER.m_id;
-	setorigin(proj, CENTER_OR_VIEWOFS(self));
+	setorigin(proj, CENTER_OR_VIEWOFS(this));
 
 	//proj.glow_size = 50;
 	//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;
@@ -190,20 +202,20 @@ void M_Spider_Attack_Web()
 	CSQCProjectile(proj, true, PROJECTILE_ELECTRO, true);
 }
 
-bool M_Spider_Attack(int attack_type, entity targ)
-{SELFPARAM();
+bool M_Spider_Attack(int attack_type, entity actor, entity targ)
+{
     .entity weaponentity = weaponentities[0];
 	switch(attack_type)
 	{
 		Weapon wep = WEP_SPIDER_ATTACK;
 		case MONSTER_ATTACK_MELEE:
 		{
-			wep.wr_think(wep, self, weaponentity, 2);
+			wep.wr_think(wep, actor, weaponentity, 2);
 			return true;
 		}
 		case MONSTER_ATTACK_RANGED:
 		{
-			wep.wr_think(wep, self, weaponentity, 1);
+			wep.wr_think(wep, actor, weaponentity, 1);
 			return true;
 		}
 	}
@@ -211,60 +223,65 @@ bool M_Spider_Attack(int attack_type, entity targ)
 	return false;
 }
 
-spawnfunc(monster_spider) { Monster_Spawn(MON_SPIDER.monsterid); }
+spawnfunc(monster_spider) { Monster_Spawn(this, MON_SPIDER.monsterid); }
 #endif // SVQC
 
-		#ifdef SVQC
-		METHOD(Spider, mr_think, bool(Spider thismon))
-		{
-			return true;
-		}
-		METHOD(Spider, mr_pain, bool(Spider thismon))
-		{
-			return true;
-		}
-		METHOD(Spider, mr_death, bool(Spider thismon))
-		{
-			SELFPARAM();
-			setanim(self, self.anim_melee, false, true, true);
-			self.angles_x = 180;
-			return true;
-		}
-		#endif
-		#ifndef MENUQC
-		METHOD(Spider, mr_anim, bool(Spider thismon))
-		{
-			SELFPARAM();
-			vector none = '0 0 0';
-			self.anim_walk = animfixfps(self, '1 1 1', none);
-			self.anim_idle = animfixfps(self, '0 1 1', none);
-			self.anim_melee = animfixfps(self, '2 1 5', none); // analyze models and set framerate
-			self.anim_shoot = animfixfps(self, '3 1 5', none); // analyze models and set framerate
-			self.anim_run = animfixfps(self, '1 1 1', none);
+#ifdef SVQC
+METHOD(Spider, mr_think, bool(Spider this, entity actor))
+{
+    TC(Spider, this);
+    return true;
+}
 
-			return true;
-		}
-		#endif
-		#ifdef SVQC
-		spawnfunc(item_health_medium);
-		METHOD(Spider, mr_setup, bool(Spider thismon))
-		{
-			SELFPARAM();
-			if(!self.health) self.health = (autocvar_g_monster_spider_health);
-			if(!self.speed) { self.speed = (autocvar_g_monster_spider_speed_walk); }
-			if(!self.speed2) { self.speed2 = (autocvar_g_monster_spider_speed_run); }
-			if(!self.stopspeed) { self.stopspeed = (autocvar_g_monster_spider_speed_stop); }
-			if(!self.damageforcescale) { self.damageforcescale = (autocvar_g_monster_spider_damageforcescale); }
+METHOD(Spider, mr_pain, bool(Spider this, entity actor))
+{
+    TC(Spider, this);
+    return true;
+}
 
-			self.monster_loot = spawnfunc_item_health_medium;
-			self.monster_attackfunc = M_Spider_Attack;
+METHOD(Spider, mr_death, bool(Spider this, entity actor))
+{
+    TC(Spider, this);
+    setanim(actor, actor.anim_melee, false, true, true);
+    actor.angles_x = 180;
+    return true;
+}
+#endif
+#ifndef MENUQC
+METHOD(Spider, mr_anim, bool(Spider this, entity actor))
+{
+    TC(Spider, this);
+    vector none = '0 0 0';
+    actor.anim_walk = animfixfps(actor, '1 1 1', none);
+    actor.anim_idle = animfixfps(actor, '0 1 1', none);
+    actor.anim_melee = animfixfps(actor, '2 1 5', none); // analyze models and set framerate
+    actor.anim_shoot = animfixfps(actor, '3 1 5', none); // analyze models and set framerate
+    actor.anim_run = animfixfps(actor, '1 1 1', none);
+    return true;
+}
+#endif
+#ifdef SVQC
+spawnfunc(item_health_medium);
+METHOD(Spider, mr_setup, bool(Spider this, entity actor))
+{
+    TC(Spider, this);
+    if(!actor.health) actor.health = (autocvar_g_monster_spider_health);
+    if(!actor.speed) { actor.speed = (autocvar_g_monster_spider_speed_walk); }
+    if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_spider_speed_run); }
+    if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_spider_speed_stop); }
+    if(!actor.damageforcescale) { actor.damageforcescale = (autocvar_g_monster_spider_damageforcescale); }
 
-			return true;
-		}
-		METHOD(Spider, mr_precache, bool(Spider thismon))
-		{
-			return true;
-		}
-		#endif
+    actor.monster_loot = spawnfunc_item_health_medium;
+    actor.monster_attackfunc = M_Spider_Attack;
+
+    return true;
+}
+
+METHOD(Spider, mr_precache, bool(Spider this))
+{
+    TC(Spider, this);
+    return true;
+}
+#endif
 
 #endif