X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmutators%2Fevents.qh;h=9a2e8b1373be23d9d79db6e53fe9326384beb8b3;hb=fc15d72b041c9a748b605ba28735380fbe5b5b01;hp=baaba14aef2a0f6d5607f688f1d79192486f4d0c;hpb=7f64f637f43db3555fbe00e2424c68474de7bcc0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh
index baaba14ae..9a2e8b137 100644
--- a/qcsrc/client/mutators/events.qh
+++ b/qcsrc/client/mutators/events.qh
@@ -1,13 +1,6 @@
-#ifndef CLIENT_MUTATORS_EVENTS_H
-#define CLIENT_MUTATORS_EVENTS_H
+#pragma once
 
-#include "../../common/mutators/base.qh"
-
-// globals
-
-string cmd_name;
-int cmd_argc;
-string cmd_string;
+#include <common/mutators/base.qh>
 
 /**
  * Called when a client command is parsed
@@ -17,6 +10,8 @@ string cmd_string;
  * // example:
  * MUTATOR_HOOKFUNCTION(foo, CSQC_ConsoleCommand) {
  *     if (MUTATOR_RETURNVALUE) return false; // command was already handled
+ *     string cmd_name = M_ARGV(0, string);
+ *     int cmd_argc = M_ARGV(1, int);
  *     if (cmd_name == "echocvar" && cmd_argc >= 2) {
  *         print(cvar_string(argv(1)), "\n");
  *         return true;
@@ -29,9 +24,9 @@ string cmd_string;
  * }
  */
 #define EV_CSQC_ConsoleCommand(i, o) \
-	/** command name */ i(string, cmd_name) \
-	/** also, argv() can be used */ i(int, cmd_argc) \
-	/** whole command, use only if you really have to */ i(string, cmd_string) \
+ 	/** command name */ i(string, MUTATOR_ARGV_0_string) \
+ 	/** argc (also, argv() can be used) */ i(int, MUTATOR_ARGV_1_int) \
+ 	/** whole command, use only if you really have to */ i(string, MUTATOR_ARGV_2_string) \
 	/**/
 MUTATOR_HOOKABLE(CSQC_ConsoleCommand, EV_CSQC_ConsoleCommand);
 
@@ -40,13 +35,13 @@ MUTATOR_HOOKABLE(UpdateCrosshair, EV_NO_ARGS);
 
 /** Called when a projectile is linked with CSQC */
 #define EV_Ent_Projectile(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(Ent_Projectile, EV_Ent_Projectile);
 
 /** Called when a projectile's properties are being modified */
 #define EV_EditProjectile(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(EditProjectile, EV_EditProjectile);
 
@@ -55,25 +50,25 @@ MUTATOR_HOOKABLE(PrecacheProjectiles, EV_NO_ARGS);
 
 /** Called when updating the attached tags index */
 #define EV_TagIndex_Update(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(TagIndex_Update, EV_TagIndex_Update);
 
 /** Called when setting the attached tags */
 #define EV_TagIndex_Apply(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(TagIndex_Apply, EV_TagIndex_Apply);
 
 /** Called when setting up skeleton bones */
 #define EV_Skeleton_CheckBones(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(Skeleton_CheckBones, EV_Skeleton_CheckBones);
 
 /** Called when setting up bones from the loaded model */
 #define EV_Skeleton_CheckModel(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(Skeleton_CheckModel, EV_Skeleton_CheckModel);
 
@@ -82,32 +77,20 @@ MUTATOR_HOOKABLE(ClearModelParams, EV_NO_ARGS);
 
 /** Called when getting the global parameters for a model */
 #define EV_GetModelParams(i, o) \
-	/** entity id */ i(string, checkmodel_input) \
-	/** entity id */ i(string, checkmodel_command) \
+	/** input */  i(string, MUTATOR_ARGV_0_string) \
+	/** command */  i(string, MUTATOR_ARGV_1_string) \
 	/**/
-string checkmodel_input, checkmodel_command;
 MUTATOR_HOOKABLE(GetModelParams, EV_GetModelParams);
 
-/** called when a player presses the jump key */
-#define EV_PlayerJump(i, o) \
-	/**/ i(float, player_multijump) \
-	/**/ i(float, player_jumpheight) \
-	/**/ o(float, player_multijump) \
-	/**/ o(float, player_jumpheight) \
-	/**/
-float player_multijump;
-float player_jumpheight;
-MUTATOR_HOOKABLE(PlayerJump, EV_PlayerJump);
-
 /** Called checking if 3rd person mode should be forced on */
 #define EV_WantEventchase(i, o) \
-	/** entity id */ i(entity, __self) \
+	/** entity id */ i(entity, MUTATOR_ARGV_0_entity) \
 	/**/
 MUTATOR_HOOKABLE(WantEventchase, EV_WantEventchase);
 
 #define EV_AnnouncerOption(i, o) \
-	/**/ i(string, ret_string) \
-	/**/ o(string, ret_string) \
+	/** announcer string */  i(string, MUTATOR_ARGV_0_string) \
+	/** announcer string */ o(string, MUTATOR_ARGV_0_string) \
 	/**/
 MUTATOR_HOOKABLE(AnnouncerOption, EV_AnnouncerOption);
 
@@ -115,7 +98,7 @@ MUTATOR_HOOKABLE(Ent_Init, EV_NO_ARGS);
 
 #define EV_HUD_Draw_overlay(i, o) \
 	/**/ o(vector, MUTATOR_ARGV_0_vector) \
-	/**/ o(float, MUTATOR_ARGV_0_float) \
+	/**/ o(float, MUTATOR_ARGV_1_float) \
 	/**/
 MUTATOR_HOOKABLE(HUD_Draw_overlay, EV_HUD_Draw_overlay);
 
@@ -123,18 +106,21 @@ MUTATOR_HOOKABLE(HUD_Powerups_add, EV_NO_ARGS);
 
 /** Return true to not draw any vortex beam */
 #define EV_Particles_VortexBeam(i, o) \
-	/**/ i(vector, vbeam_shotorg) \
-	/**/ i(vector, vbeam_endpos) \
+	/** beam shot origin */  i(vector, MUTATOR_ARGV_0_vector) \
+	/** beam end position */ i(vector, MUTATOR_ARGV_1_vector) \
 	/**/
-vector vbeam_shotorg;
-vector vbeam_endpos;
 MUTATOR_HOOKABLE(Particles_VortexBeam, EV_Particles_VortexBeam);
 
 /** Return true to not draw any impact effect */
 #define EV_Weapon_ImpactEffect(i, o) \
-	/**/ i(entity, w_hitwep) \
+	/** weapon */ 			i(entity, MUTATOR_ARGV_0_entity) \
+	/** damage entity */ 	i(entity, MUTATOR_ARGV_1_entity) \
 	/**/
-entity w_hitwep;
 MUTATOR_HOOKABLE(Weapon_ImpactEffect, EV_Weapon_ImpactEffect);
 
-#endif
+/* NOTE: hooks MUST start with if (MUTATOR_RETURNVALUE) return false;
+*/
+#define EV_HUD_Command(i, o) \
+	/** argc (also, argv() can be used) */ i(int, MUTATOR_ARGV_0_int) \
+	/**/
+MUTATOR_HOOKABLE(HUD_Command, EV_HUD_Command);