X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fbase.qh;h=b2f9b29fda64b36d1df56e15536b2b3ad45168d2;hb=2bb2db9c0f8016645a23381d7493588d748ecacf;hp=1b6cea8fc4501ee47eaa8b26089926d927544878;hpb=3b4538464212cdef7e377e6e203e820178a76fe6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index 1b6cea8fc..b2f9b29fd 100644
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -18,6 +18,7 @@ float CallbackChain_Call(entity cb);
 
 #define MUTATOR_REMOVING 0
 #define MUTATOR_ADDING 1
+#define MUTATOR_ROLLING_BACK 2
 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
@@ -27,9 +28,10 @@ void Mutator_Remove(mutatorfunc_t func, string name); // calls error() on fail
 #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()
-#define MUTATOR_HOOK(cb,func,order) do { if(mode == MUTATOR_ADDING) { if(!HOOK_##cb) HOOK_##cb = CallbackChain_New(#cb); if(!CallbackChain_Add(HOOK_##cb,HOOKFUNCTION_##func,order)) { print("HOOK FAILED: ", #func, "\n"); return 1; } } else if(mode == MUTATOR_REMOVING) { if(HOOK_##cb) CallbackChain_Remove(HOOK_##cb,HOOKFUNCTION_##func); } } while(0)
+#define MUTATOR_HOOK(cb,func,order) do { if(mode == MUTATOR_ADDING) { if(!HOOK_##cb) HOOK_##cb = CallbackChain_New(#cb); if(!CallbackChain_Add(HOOK_##cb,HOOKFUNCTION_##func,order)) { print("HOOK FAILED: ", #func, "\n"); return 1; } } else if(mode == MUTATOR_REMOVING || mode == MUTATOR_ROLLING_BACK) { if(HOOK_##cb) CallbackChain_Remove(HOOK_##cb,HOOKFUNCTION_##func); } } while(0)
 #define MUTATOR_ONADD if(mode == MUTATOR_ADDING)
 #define MUTATOR_ONREMOVE if(mode == MUTATOR_REMOVING)
+#define MUTATOR_ONROLLBACK_OR_REMOVE if(mode == MUTATOR_REMOVING || mode == MUTATOR_ROLLING_BACK)
 
 #define MUTATOR_HOOKABLE(cb) entity HOOK_##cb
 #define MUTATOR_CALLHOOK(cb) CallbackChain_Call(HOOK_##cb)
@@ -44,10 +46,22 @@ void Mutator_Remove(mutatorfunc_t func, string name); // calls error() on fail
 MUTATOR_HOOKABLE(MakePlayerObserver);
 	// called when a player becomes observer, after shared setup
 
+MUTATOR_HOOKABLE(PutClientInServer);
+	entity self; // client wanting to spawn
+
 MUTATOR_HOOKABLE(PlayerSpawn);
 	entity spawn_spot; // spot that was used, or world
 	// called when a player spawns as player, after shared setup, before his weapon is chosen (so items may be changed in here)
 
+MUTATOR_HOOKABLE(reset_map_global);
+	// called in reset_map
+
+MUTATOR_HOOKABLE(reset_map_players);
+	// called in reset_map
+
+MUTATOR_HOOKABLE(ForbidPlayerScore_Clear);
+	// returns 1 if clearing player score shall not be allowed
+
 MUTATOR_HOOKABLE(ClientDisconnect);
 	// called when a player disconnects
 
@@ -57,6 +71,7 @@ MUTATOR_HOOKABLE(PlayerDies);
 		entity frag_inflictor;
 		entity frag_attacker;
 		entity frag_target; // same as self
+		float frag_deathtype;
 
 MUTATOR_HOOKABLE(GiveFragsForKill);
 	// called when someone was fragged by "self", and is expected to change frag_score to adjust scoring for the kill
@@ -94,6 +109,11 @@ MUTATOR_HOOKABLE(BuildMutatorsPrettyString);
 	// appends ", Mutator name" to ret_string for display
 	// INPUT, OUTPUT:
 		string ret_string;
+		
+MUTATOR_HOOKABLE(CustomizeWaypoint);
+	// called every frame
+	// customizes the waypoint for spectators
+	// INPUT: self = waypoint, other = player, other.enemy = spectator
 
 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)
@@ -140,7 +160,7 @@ MUTATOR_HOOKABLE(PlayerDamage_SplitHealthArmor);
 		float damage_save;
 		
 MUTATOR_HOOKABLE(PlayerDamage_Calculate);
-	// called to adjust damage and force values which are applied to the player, used for e.g. strength damage/force multiplier or runematch runes
+	// called to adjust damage and force values which are applied to the player, used for e.g. strength damage/force multiplier
 	// i'm not sure if I should change this around slightly (Naming of the entities, and also how they're done in g_damage).
 	// INPUT:
 		entity frag_attacker;
@@ -148,6 +168,7 @@ MUTATOR_HOOKABLE(PlayerDamage_Calculate);
 		float frag_deathtype;
 	// INPUT, OUTPUT:
 		float frag_damage;
+		float frag_mirrordamage;
 		vector frag_force;
 
 MUTATOR_HOOKABLE(PlayerPowerups);
@@ -205,6 +226,12 @@ MUTATOR_HOOKABLE(SV_StartFrame);
 MUTATOR_HOOKABLE(SetModname);
 	// OUT
 	string modname; // name of the mutator/mod if it warrants showing as such in the server browser
+	
+MUTATOR_HOOKABLE(Item_Spawn);
+	// called for each item being spawned on a map, including dropped weapons
+	// return 1 to remove an item
+	// INPUT
+	entity self; // the item
 
 MUTATOR_HOOKABLE(SetWeaponreplace);
 	// IN
@@ -212,6 +239,17 @@ MUTATOR_HOOKABLE(SetWeaponreplace);
 		entity other; // weapon info
 	// IN+OUT
 		string ret_string;
+		
+MUTATOR_HOOKABLE(Item_RespawnCountdown);
+	// called when an item is about to respawn
+	// INPUT+OUTPUT:
+	string item_name;
+	vector item_color;
+		
+MUTATOR_HOOKABLE(BotShouldAttack);
+	// called when a bot checks a target to attack
+	// INPUT
+	entity checkentity;
 
 MUTATOR_HOOKABLE(PortalTeleport);
 	// called whenever a player goes through a portal gun teleport
@@ -227,6 +265,10 @@ MUTATOR_HOOKABLE(HelpMePing);
 	// INPUT
 	entity self; // the player who pressed impulse 33
 	
+MUTATOR_HOOKABLE(VehicleSpawn);
+	// called when a vehicle initializes
+	// return TRUE to remove the vehicle
+	
 MUTATOR_HOOKABLE(VehicleEnter);
 	// called when a player enters a vehicle
 	// allows mutators to set special settings in this event