X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fsv_monsters.qc;h=34bd6e5aa4cffb64c6de7793a873143f9c2d89a1;hp=e3e1de4b433d1254389a081c55a556e6e630a8a8;hb=a77c14223df1103793956a4f7522bd4b6f60dd40;hpb=a0aa9384d83cbcb27854f0d89121eb547d894c91

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index e3e1de4b43..34bd6e5aa4 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -471,7 +471,8 @@ void Monster_UpdateModel()
 	self.anim_die2   = animfixfps(self, '9 1 0.01', '0 0 0');*/
 
 	// then get the real values
-	_MON_ACTION(self.monsterid, MR_ANIM);
+	Monster mon = get_monsterinfo(self.monsterid);
+	mon.mr_anim(mon);
 }
 
 void Monster_Touch()
@@ -1037,7 +1038,8 @@ void Monster_Dead(entity attacker, float gibbed)
 
 	CSQCModel_UnlinkEntity();
 
-	_MON_ACTION(self.monsterid, MR_DEATH);
+	Monster mon = get_monsterinfo(self.monsterid);
+	mon.mr_death(mon);
 
 	if(self.candrop && self.weapon)
 		W_ThrowNewWeapon(self, self.weapon, 0, self.origin, randomvec() * 150 + '0 0 325');
@@ -1070,7 +1072,8 @@ void Monster_Damage(entity inflictor, entity attacker, float damage, int deathty
 	damage_take = take;
 	frag_attacker = attacker;
 	frag_deathtype = deathtype;
-	_MON_ACTION(self.monsterid, MR_PAIN);
+	Monster mon = get_monsterinfo(self.monsterid);
+	mon.mr_pain(mon);
 	take = damage_take;
 
 	if(take)
@@ -1231,7 +1234,8 @@ void Monster_Think()
 		return;
 	}
 
-	if(_MON_ACTION(self.monsterid, MR_THINK))
+	Monster mon = get_monsterinfo(self.monsterid);
+	if(mon.mr_think(mon))
 		Monster_Move(self.speed2, self.speed, self.stopspeed);
 
 	Monster_Anim();
@@ -1241,7 +1245,8 @@ void Monster_Think()
 
 float Monster_Spawn_Setup()
 {SELFPARAM();
-	_MON_ACTION(self.monsterid, MR_SETUP);
+	Monster mon = get_monsterinfo(self.monsterid);
+	mon.mr_setup(mon);
 
 	// ensure some basic needs are met
 	if(!self.health) { self.health = 100; }