X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster%2Fspider.qc;h=21e0dbeb5c0ebc8e5dc3bdc4e15c663ea75bdfbf;hb=75d8c631b71daf6ad2019d8139771f00ad426d33;hp=427f63107ff224f4b9c7d14277ca97ba81d5a480;hpb=244e5081c5c503c307e557c98ac864f6c9731475;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index 427f63107..21e0dbeb5 100644
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -1,15 +1,19 @@
-#ifdef REGISTER_MONSTER
-REGISTER_MONSTER(
+#ifndef MENUQC
+bool m_spider(int);
+#endif
+REGISTER_MONSTER_SIMPLE(
 /* MON_##id   */ SPIDER,
-/* function   */ m_spider,
 /* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RANGED,
 /* mins,maxs  */ '-18 -18 -25', '18 18 30',
 /* model      */ "spider.dpm",
 /* netname    */ "spider",
 /* fullname   */ _("Spider")
-);
+) {
+#ifndef MENUQC
+	this.monster_func = m_spider;
+#endif
+}
 
-#else
 #ifdef SVQC
 float autocvar_g_monster_spider_health;
 float autocvar_g_monster_spider_attack_bite_damage;
@@ -34,10 +38,10 @@ void spider_web_explode()
 	entity e;
 	if(self)
 	{
-		pointparticles(particleeffectnum("electro_impact"), self.origin, '0 0 0', 1);
+		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)
+		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)
 			e.spider_slowness = time + (autocvar_g_monster_spider_attack_web_damagetime);
 
 		remove(self);
@@ -55,7 +59,7 @@ void spider_shootweb()
 {
 	monster_makevectors(self.enemy);
 
-	sound(self, CH_SHOTS, "weapons/electro_fire2.wav", VOL_BASE, ATTEN_NORM);
+	sound(self, CH_SHOTS, W_Sound("electro_fire2"), VOL_BASE, ATTEN_NORM);
 
 	entity proj = spawn ();
 	proj.classname = "plasma";
@@ -119,7 +123,7 @@ void spawnfunc_monster_spider()
 {
 	self.classname = "monster_spider";
 
-	if(!monster_initialize(MON_SPIDER)) { remove(self); return; }
+	if(!monster_initialize(MON_SPIDER.monsterid)) { remove(self); return; }
 }
 
 float m_spider(float req)
@@ -150,7 +154,7 @@ float m_spider(float req)
 		case MR_PRECACHE:
 		{
 			precache_model("models/monsters/spider.dpm");
-			precache_sound ("weapons/electro_fire2.wav");
+			precache_sound (W_Sound("electro_fire2"));
 			return true;
 		}
 	}
@@ -174,4 +178,3 @@ float m_spider(float req)
 }
 
 #endif // CSQC
-#endif // REGISTER_MONSTER