X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fbase.qh;h=73b23bbd3f224201ecffa53725fe544a3b225573;hb=e94265ad288642992b14bd2237b69511a3d66c8e;hp=b254dfe846eaa1ed6fc2d6cb5c3ac8729c0c661c;hpb=7eb1015823c7b86bd36ad10be79701239e695dec;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index b254dfe84..73b23bbd3 100644
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -3,6 +3,8 @@
 #define CBC_ORDER_LAST 2
 #define CBC_ORDER_ANY 4
 
+float CallbackChain_ReturnValue; // read-only field of the current return value
+
 entity CallbackChain_New(string name);
 float CallbackChain_Add(entity cb, float() func, float order)
 float CallbackChain_Remove(entity cb, float() func);
@@ -16,11 +18,12 @@ float CallbackChain_Call(entity cb);
 
 #define MUTATOR_REMOVING 0
 #define MUTATOR_ADDING 1
-float Mutator_Add(float(float) func);
-void Mutator_Remove(float(float) func); // calls error() on fail
+typedef float(float) mutatorfunc_t;
+float Mutator_Add(mutatorfunc_t func, string name);
+void Mutator_Remove(mutatorfunc_t func, string name); // calls error() on fail
 
-#define MUTATOR_ADD(name) Mutator_Add(MUTATOR_##name)
-#define MUTATOR_REMOVE(name) Mutator_Remove(MUTATOR_##name)
+#define MUTATOR_ADD(name) Mutator_Add(MUTATOR_##name, #name)
+#define MUTATOR_REMOVE(name) Mutator_Remove(MUTATOR_##name, #name)
 #define MUTATOR_DEFINITION(name) float MUTATOR_##name(float mode)
 #define MUTATOR_DECLARATION(name) float MUTATOR_##name(float mode)
 #define MUTATOR_HOOKFUNCTION(name) float HOOKFUNCTION_##name()
@@ -31,6 +34,7 @@ void Mutator_Remove(float(float) func); // calls error() on fail
 #define MUTATOR_HOOKABLE(cb) entity HOOK_##cb
 #define MUTATOR_CALLHOOK(cb) CallbackChain_Call(HOOK_##cb)
 
+#define MUTATOR_RETURNVALUE CallbackChain_ReturnValue
 
 
 
@@ -94,6 +98,10 @@ MUTATOR_HOOKABLE(FilterItem);
 	// checks if the current item may be spawned (self.items and self.weapons may be read and written to, as well as the ammo_ fields)
 	// return error to request removal
 
+MUTATOR_HOOKABLE(TurretSpawn);
+	// return error to request removal
+	// INPUT: self - turret
+	
 MUTATOR_HOOKABLE(OnEntityPreSpawn);
 	// return error to prevent entity spawn, or modify the entity
 
@@ -136,6 +144,47 @@ MUTATOR_HOOKABLE(PlayerDamage_Calculate);
 	// INPUT:
 		entity frag_attacker;
 		entity frag_target;
+		float frag_deathtype;
 	// INPUT, OUTPUT:
 		float frag_damage;
 		vector frag_force;
+
+MUTATOR_HOOKABLE(PlayerPowerups);
+	// called at the end of player_powerups() in cl_client.qc, used for manipulating the values which are set by powerup items.
+	// INPUT
+	entity self;
+	float olditems; // also technically output, but since it is at the end of the function it's useless for that :P 
+
+MUTATOR_HOOKABLE(PlayerUseKey);
+	// called when the use key is pressed
+	// if MUTATOR_RETURNVALUE is 1, don't do anything
+	// return 1 if the use key actually did something
+
+MUTATOR_HOOKABLE(SV_ParseClientCommand);
+	// called when a client command is parsed
+	// NOTE: hooks MUST start with if(MUTATOR_RETURNVALUE) return 0;
+	// NOTE: return 1 if you handled the command, return 0 to continue handling
+	// NOTE: THESE HOOKS MUST NEVER EVER CALL tokenize()
+	// INPUT
+	string cmd_name; // command name
+	float cmd_argc; // also, argv() can be used
+	string cmd_string; // whole command, use only if you really have to
+	/*
+		// example:
+		MUTATOR_HOOKFUNCTION(foo_SV_ParseClientCommand)
+		{
+			if(MUTATOR_RETURNVALUE) // command was already handled?
+				return 0;
+			if(cmd_name == "echocvar" && cmd_argc >= 2)
+			{
+				print(cvar_string(argv(1)), "\n");
+				return 1;
+			}
+			if(cmd_name == "echostring" && cmd_argc >= 2)
+			{
+				print(substring(cmd_string, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), "\n");
+				return 1;
+			}
+			return 0;
+		}
+	*/