Cleanse the last of the server side mutator hooks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / events.qh

diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index 0d692ba2f2e2bd7203b37efa99b5fab423af7c9d..f7782504b9efa79fc51a68feacd62cb0f9510344 100644 (file)
--- a/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@ -123,7 +123,7 @@ MUTATOR_HOOKABLE(ForbidThrowCurrentWeapon, EV_ForbidThrowCurrentWeapon);
 
 /** returns true if dropping the current weapon shall not be allowed at any time including death */
 #define EV_ForbidDropCurrentWeapon(i, o) \
-    /** player        */ i(entity, MUTATOR_ARGV_0_entity) \
+    /** player */ i(entity, MUTATOR_ARGV_0_entity) \
     /**/
 MUTATOR_HOOKABLE(ForbidDropCurrentWeapon, EV_ForbidDropCurrentWeapon);
 
@@ -656,27 +656,25 @@ MUTATOR_HOOKABLE(ClientKill, EV_ClientKill);
 MUTATOR_HOOKABLE(FixClientCvars, EV_FixClientCvars);
 
 #define EV_SpectateSet(i, o) \
-    /**/ i(entity, __self) \
-    /**/ i(entity, spec_player) \
-    /**/ o(entity, spec_player) \
+    /** client */    i(entity, MUTATOR_ARGV_0_entity) \
+    /** target */    i(entity, MUTATOR_ARGV_1_entity) \
+    /**/             o(entity, MUTATOR_ARGV_1_entity) \
     /**/
-entity spec_player;
 MUTATOR_HOOKABLE(SpectateSet, EV_SpectateSet);
 
 #define EV_SpectateNext(i, o) \
-    /**/ i(entity, __self) \
-    /**/ i(entity, spec_player) \
-    /**/ o(entity, spec_player) \
+    /** client */    i(entity, MUTATOR_ARGV_0_entity) \
+    /** target */    i(entity, MUTATOR_ARGV_1_entity) \
+    /**/             o(entity, MUTATOR_ARGV_1_entity) \
     /**/
 MUTATOR_HOOKABLE(SpectateNext, EV_SpectateNext);
 
 #define EV_SpectatePrev(i, o) \
-    /**/ i(entity, __self) \
-    /**/ i(entity, spec_player) \
-    /**/ o(entity, spec_player) \
-    /**/ i(entity, spec_first) \
+    /** client */    i(entity, MUTATOR_ARGV_0_entity) \
+    /** target */    i(entity, MUTATOR_ARGV_1_entity) \
+    /**/             o(entity, MUTATOR_ARGV_1_entity) \
+       /** first */     i(entity, MUTATOR_ARGV_2_entity) \
     /**/
-entity spec_first;
 MUTATOR_HOOKABLE(SpectatePrev, EV_SpectatePrev);
 
 enum {
@@ -687,17 +685,15 @@ enum {
 
 /** called when player triggered kill (or is changing teams), return error to not do anything */
 #define EV_Bot_FixCount(i, o) \
-    /**/ i(int, bot_activerealplayers) \
-    /**/ o(int, bot_activerealplayers) \
-    /**/ i(int, bot_realplayers) \
-    /**/ o(int, bot_realplayers) \
+       /** active real players */  i(int, MUTATOR_ARGV_0_int) \
+       /**/                                            o(int, MUTATOR_ARGV_0_int) \
+    /** real players */                i(int, MUTATOR_ARGV_1_int) \
+    /**/                                       o(int, MUTATOR_ARGV_1_int) \
     /**/
-int bot_activerealplayers;
-int bot_realplayers;
 MUTATOR_HOOKABLE(Bot_FixCount, EV_Bot_FixCount);
 
 #define EV_ClientCommand_Spectate(i, o) \
-    /**/ i(entity, __self) \
+    /** player */ i(entity, MUTATOR_ARGV_0_entity) \
     /**/
 MUTATOR_HOOKABLE(ClientCommand_Spectate, EV_ClientCommand_Spectate);
 
@@ -762,16 +758,13 @@ MUTATOR_HOOKABLE(AllowMobButcher, EV_AllowMobButcher);
 MUTATOR_HOOKABLE(ReadLevelCvars, EV_NO_ARGS);
 
 #define EV_SendWaypoint(i, o) \
-    /**/ i(entity, __self) \
-    /**/ i(entity, wp_sendto) \
-    /**/ i(int, wp_sendflags) \
-    /**/ o(int, wp_sendflags) \
-    /**/ i(int, wp_flag) \
-    /**/ o(int, wp_flag) \
-    /**/
-entity wp_sendto;
-int wp_sendflags;
-int wp_flag;
+       /** waypoint */     i(entity, MUTATOR_ARGV_0_entity) \
+       /** to */               i(entity, MUTATOR_ARGV_1_entity) \
+       /** send flags */   i(int, MUTATOR_ARGV_2_int) \
+       /**/                            o(int, MUTATOR_ARGV_2_int) \
+       /** wp flag */      i(int, MUTATOR_ARGV_3_int) \
+       /**/                            o(int, MUTATOR_ARGV_3_int) \
+    /**/
 MUTATOR_HOOKABLE(SendWaypoint, EV_SendWaypoint);
 
 #define EV_TurretValidateTarget(i, o) \
@@ -783,7 +776,7 @@ MUTATOR_HOOKABLE(SendWaypoint, EV_SendWaypoint);
 MUTATOR_HOOKABLE(TurretValidateTarget, EV_TurretValidateTarget);
 
 #define EV_TurretThink(i, o) \
-    /**/ i(entity, __self) \
+    /** turret */ i(entity, MUTATOR_ARGV_0_entity) \
     /**/
 MUTATOR_HOOKABLE(TurretThink, EV_TurretThink);
 
@@ -792,37 +785,30 @@ MUTATOR_HOOKABLE(Ent_Init, EV_NO_ARGS);
 /** */
 #define EV_PrepareExplosionByDamage(i, o) \
     /** projectile */ i(entity, MUTATOR_ARGV_0_entity) \
-    /** attacker */ i(entity, MUTATOR_ARGV_1_entity) \
+    /** attacker */   i(entity, MUTATOR_ARGV_1_entity) \
     /**/
 MUTATOR_HOOKABLE(PrepareExplosionByDamage, EV_PrepareExplosionByDamage);
 
 /** called when a monster model is about to be set, allows custom paths etc. */
 #define EV_MonsterModel(i, o) \
-    /**/ i(string, monster_model) \
-    /**/ i(string, monster_model_output) \
-    /**/ o(string, monster_model_output) \
+       /** model */  i(string, MUTATOR_ARGV_0_string) \
+       /** output */ i(string, MUTATOR_ARGV_1_string) \
+       /**/              o(string, MUTATOR_ARGV_1_string) \
     /**/
-string monster_model;
-string monster_model_output;
 MUTATOR_HOOKABLE(MonsterModel, EV_MonsterModel);
 
 /**/
 #define EV_Player_ChangeTeam(i, o) \
-    /**/ i(entity, __self) \
-    /**/ i(float, pct_curteam) \
-    /**/ i(float, pct_newteam) \
+    /** player */         i(entity, MUTATOR_ARGV_0_entity) \
+       /** current team */   i(float, MUTATOR_ARGV_1_float) \
+       /** new team */       i(float, MUTATOR_ARGV_2_float) \
     /**/
-float pct_curteam;
-float pct_newteam;
 MUTATOR_HOOKABLE(Player_ChangeTeam, EV_Player_ChangeTeam);
 
 /**/
 #define EV_URI_GetCallback(i, o) \
-    /**/ i(float, uricb_id) \
-    /**/ i(float, uricb_status) \
-    /**/ i(string, uricb_data) \
+       /** id */       i(float, MUTATOR_ARGV_0_float) \
+       /** status */   i(float, MUTATOR_ARGV_1_float) \
+       /** data */     i(string, MUTATOR_ARGV_2_string) \
     /**/
-float uricb_id;
-float uricb_status;
-string uricb_data;
 MUTATOR_HOOKABLE(URI_GetCallback, EV_URI_GetCallback);