Merge branch 'master' into Mario/weaponarena_available

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qh

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index d1d224363d314dc52e59199c3f794c7e34b60830..9d890d7358eb71335c9f0f0e47fa40612f4853eb 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -1,9 +1,6 @@
-#ifndef SV_MONSTERS_H
-#define SV_MONSTERS_H
+#pragma once
 
 // stats networking
-.int stat_monsters_killed;
-.int stat_monsters_total;
 int monsters_total;
 int monsters_killed;
 
@@ -33,7 +30,6 @@ int monsters_killed;
 
 // other properties
 .bool monster_attack; // indicates whether an entity can be attacked by monsters
-.float spider_slowness; // effect time of slowness inflicted by spiders
 
 // monster state declarations
 const int MONSTER_MOVE_FOLLOW = 1; // monster will follow if in range, or stand still
@@ -70,29 +66,32 @@ const int MONSTERFLAG_RESPAWNED = 32768; // flag for re-spawned monsters
 .int monster_skill;
 
 // functions used elsewhere
-void Monster_Remove(entity mon);
+void Monster_Remove(entity this);
 
-void monsters_setstatus();
+void monsters_setstatus(entity this);
 
-bool Monster_Spawn(int mon_id);
+bool Monster_Spawn(entity this, bool check_appear, int mon_id);
 
-void monster_setupcolors(entity mon);
+void monster_setupcolors(entity this);
 
-void Monster_Touch();
+void Monster_Touch(entity this, entity toucher);
 
-void Monster_Move_2D(float mspeed, float allow_jumpoff);
+void Monster_Move_2D(entity this, float mspeed, float allow_jumpoff);
 
-void Monster_Delay(float repeat_count, float repeat_defer, float defer_amnt, void() func);
+void Monster_Delay(entity this, int repeat_count, float defer_amnt, void(entity) func);
 
-float Monster_Attack_Melee(entity targ, float damg, vector anim, float er, float animtime, int deathtype, float dostop);
+float Monster_Attack_Melee(entity this, entity targ, float damg, vector anim, float er, float animtime, int deathtype, float dostop);
 
-bool Monster_Attack_Leap(vector anm, void() touchfunc, vector vel, float animtime);
+bool Monster_Attack_Leap(entity this, vector anm, void(entity this, entity toucher) touchfunc, vector vel, float animtime);
 
-entity Monster_FindTarget(entity mon);
+entity Monster_FindTarget(entity this);
 
-void monster_makevectors(entity e);
+void monster_makevectors(entity this, entity targ);
 
-void Monster_Sound(.string samplefield, float sound_delay, float delaytoo, float chan);
+void Monster_Sound(entity this, .string samplefield, float sound_delay, float delaytoo, float chan);
+
+/** number of monsters spawned with mobspawn command */
+int totalspawned;
 
 // monster sounds
 .float msound_delay; // temporary antilag system
@@ -111,5 +110,3 @@ ALLMONSTERSOUNDS
 #undef _MSOUND
 
 float GetMonsterSoundSampleField_notFound;
-
-#endif