X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_cts.qc;h=bdaee8c314f66eeb1595a261bca15b31f6df5285;hb=7a21308e015b71524f9cc676e0b327b74b694f66;hp=9c674d45d89933fa9f24e8bc13e31e7f2a7995d4;hpb=9138acec2282209ac6867c5a34365cff3fb8fa64;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_cts.qc b/qcsrc/server/mutators/gamemode_cts.qc index 9c674d45d..bdaee8c31 100644 --- a/qcsrc/server/mutators/gamemode_cts.qc +++ b/qcsrc/server/mutators/gamemode_cts.qc @@ -1,7 +1,13 @@ +#include "gamemode_cts.qh" + +#include "gamemode.qh" + +#include "../race.qh" + // legacy bot roles .float race_checkpoint; void havocbot_role_cts() -{ +{SELFPARAM(); if(self.deadflag != DEAD_NO) return; @@ -29,7 +35,7 @@ void havocbot_role_cts() void cts_ScoreRules() { - ScoreRules_basics(0, 0, 0, FALSE); + ScoreRules_basics(0, 0, 0, false); if(g_race_qualifying) { ScoreInfo_SetLabel_PlayerScore(SP_CTS_FASTEST, "fastest", SFL_SORT_PRIO_PRIMARY | SFL_LOWER_IS_BETTER | SFL_TIME); @@ -49,8 +55,8 @@ void cts_EventLog(string mode, entity actor) // use an alias for easy changing a GameLogEcho(strcat(":cts:", mode, ":", ((actor != world) ? (strcat(":", ftos(actor.playerid))) : ""))); } -MUTATOR_HOOKFUNCTION(cts_PlayerPhysics) -{ +MUTATOR_HOOKFUNCTION(cts, PlayerPhysics) +{SELFPARAM(); // force kbd movement for fairness float wishspeed; vector wishvel; @@ -59,26 +65,26 @@ MUTATOR_HOOKFUNCTION(cts_PlayerPhysics) // ensure nothing EVIL is being done (i.e. div0_evade) // this hinders joystick users though // but it still gives SOME analog control - wishvel_x = fabs(self.movement_x); - wishvel_y = fabs(self.movement_y); - if(wishvel_x != 0 && wishvel_y != 0 && wishvel_x != wishvel_y) + wishvel.x = fabs(self.movement.x); + wishvel.y = fabs(self.movement.y); + if(wishvel.x != 0 && wishvel.y != 0 && wishvel.x != wishvel.y) { - wishvel_z = 0; + wishvel.z = 0; wishspeed = vlen(wishvel); - if(wishvel_x >= 2 * wishvel_y) + if(wishvel.x >= 2 * wishvel.y) { // pure X motion - if(self.movement_x > 0) + if(self.movement.x > 0) self.movement_x = wishspeed; else self.movement_x = -wishspeed; self.movement_y = 0; } - else if(wishvel_y >= 2 * wishvel_x) + else if(wishvel.y >= 2 * wishvel.x) { // pure Y motion self.movement_x = 0; - if(self.movement_y > 0) + if(self.movement.y > 0) self.movement_y = wishspeed; else self.movement_y = -wishspeed; @@ -86,21 +92,21 @@ MUTATOR_HOOKFUNCTION(cts_PlayerPhysics) else { // diagonal - if(self.movement_x > 0) + if(self.movement.x > 0) self.movement_x = M_SQRT1_2 * wishspeed; else self.movement_x = -M_SQRT1_2 * wishspeed; - if(self.movement_y > 0) + if(self.movement.y > 0) self.movement_y = M_SQRT1_2 * wishspeed; else self.movement_y = -M_SQRT1_2 * wishspeed; } } - - return FALSE; + + return false; } -MUTATOR_HOOKFUNCTION(cts_ResetMap) +MUTATOR_HOOKFUNCTION(cts, reset_map_global) { float s; @@ -130,25 +136,25 @@ MUTATOR_HOOKFUNCTION(cts_ResetMap) cvar_set("timelimit", ftos(race_timelimit)); cts_ScoreRules(); } - - return FALSE; + + return false; } -MUTATOR_HOOKFUNCTION(cts_PlayerPreThink) -{ +MUTATOR_HOOKFUNCTION(cts, PlayerPreThink) +{SELFPARAM(); if(IS_SPEC(self) || IS_OBSERVER(self)) if(g_race_qualifying) if(msg_entity.enemy.race_laptime) race_SendNextCheckpoint(msg_entity.enemy, 1); - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_ClientConnect) -{ +MUTATOR_HOOKFUNCTION(cts, ClientConnect) +{SELFPARAM(); race_PreparePlayer(); self.race_checkpoint = -1; - + if(IS_REAL_CLIENT(self)) { string rr = CTS_RECORD; @@ -168,11 +174,11 @@ MUTATOR_HOOKFUNCTION(cts_ClientConnect) } } - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver) -{ +MUTATOR_HOOKFUNCTION(cts, MakePlayerObserver) +{SELFPARAM(); if(PlayerScore_Add(self, SP_RACE_FASTEST, 0)) self.frags = FRAGS_LMS_LOSER; else @@ -181,11 +187,11 @@ MUTATOR_HOOKFUNCTION(cts_MakePlayerObserver) race_PreparePlayer(); self.race_checkpoint = -1; - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_PlayerSpawn) -{ +MUTATOR_HOOKFUNCTION(cts, PlayerSpawn) +{SELFPARAM(); if(spawn_spot.target == "") // Emergency: this wasn't a real spawnpoint. Can this ever happen? race_PreparePlayer(); @@ -195,12 +201,12 @@ MUTATOR_HOOKFUNCTION(cts_PlayerSpawn) self.race_respawn_spotref = spawn_spot; self.race_place = 0; - - return FALSE; + + return false; } -MUTATOR_HOOKFUNCTION(cts_PutClientInServer) -{ +MUTATOR_HOOKFUNCTION(cts, PutClientInServer) +{SELFPARAM(); if(IS_PLAYER(self)) if(!gameover) { @@ -211,24 +217,24 @@ MUTATOR_HOOKFUNCTION(cts_PutClientInServer) race_AbandonRaceCheck(self); } - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_PlayerDies) -{ +MUTATOR_HOOKFUNCTION(cts, PlayerDies) +{SELFPARAM(); self.respawn_flags |= RESPAWN_FORCE; race_AbandonRaceCheck(self); - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_BotRoles) -{ +MUTATOR_HOOKFUNCTION(cts, HavocBot_ChooseRole) +{SELFPARAM(); self.havocbot_role = havocbot_role_cts; - return TRUE; + return true; } -MUTATOR_HOOKFUNCTION(cts_PlayerPostThink) -{ +MUTATOR_HOOKFUNCTION(cts, GetPressedKeys) +{SELFPARAM(); if(self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1) { if (!self.stored_netname) @@ -241,42 +247,42 @@ MUTATOR_HOOKFUNCTION(cts_PlayerPostThink) } } - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_ForbidThrowing) +MUTATOR_HOOKFUNCTION(cts, ForbidThrowCurrentWeapon) { // no weapon dropping in CTS - return TRUE; + return true; } -MUTATOR_HOOKFUNCTION(cts_FilterItem) -{ +MUTATOR_HOOKFUNCTION(cts, FilterItem) +{SELFPARAM(); if(self.classname == "droppedweapon") - return TRUE; + return true; - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_PlayerDamage) +MUTATOR_HOOKFUNCTION(cts, PlayerDamage_Calculate) { - if(frag_target == frag_attacker || frag_deathtype == DEATH_FALL) + if(frag_target == frag_attacker || frag_deathtype == DEATH_FALL.m_id) if(!autocvar_g_cts_selfdamage) frag_damage = 0; - return FALSE; + return false; } -MUTATOR_HOOKFUNCTION(cts_ForbidClearPlayerScore) +MUTATOR_HOOKFUNCTION(cts, ForbidPlayerScore_Clear) { - return TRUE; // in CTS, you don't lose score by observing + return true; // in CTS, you don't lose score by observing } -MUTATOR_HOOKFUNCTION(cts_SetMods) +MUTATOR_HOOKFUNCTION(cts, SetModname) { g_cloaked = 1; // always enable cloak in CTS - return FALSE; + return false; } void cts_Initialize() @@ -284,23 +290,11 @@ void cts_Initialize() cts_ScoreRules(); } -MUTATOR_DEFINITION(gamemode_cts) +REGISTER_MUTATOR(cts, g_cts) { - MUTATOR_HOOK(PlayerPhysics, cts_PlayerPhysics, CBC_ORDER_ANY); - MUTATOR_HOOK(reset_map_global, cts_ResetMap, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerPreThink, cts_PlayerPreThink, CBC_ORDER_ANY); - MUTATOR_HOOK(ClientConnect, cts_ClientConnect, CBC_ORDER_ANY); - MUTATOR_HOOK(MakePlayerObserver, cts_MakePlayerObserver, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerSpawn, cts_PlayerSpawn, CBC_ORDER_ANY); - MUTATOR_HOOK(PutClientInServer, cts_PutClientInServer, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDies, cts_PlayerDies, CBC_ORDER_ANY); - MUTATOR_HOOK(HavocBot_ChooseRole, cts_BotRoles, CBC_ORDER_ANY); - MUTATOR_HOOK(GetPressedKeys, cts_PlayerPostThink, CBC_ORDER_ANY); - MUTATOR_HOOK(ForbidThrowCurrentWeapon, cts_ForbidThrowing, CBC_ORDER_ANY); - MUTATOR_HOOK(FilterItem, cts_FilterItem, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDamage_Calculate, cts_PlayerDamage, CBC_ORDER_ANY); - MUTATOR_HOOK(ForbidPlayerScore_Clear, cts_ForbidClearPlayerScore, CBC_ORDER_ANY); - MUTATOR_HOOK(SetModname, cts_SetMods, CBC_ORDER_ANY); + g_race_qualifying = 1; + independent_players = 1; + SetLimits(0, 0, 0, -1); MUTATOR_ONADD { @@ -318,7 +312,7 @@ MUTATOR_DEFINITION(gamemode_cts) MUTATOR_ONREMOVE { - print("This is a game type and it cannot be removed at runtime."); + LOG_INFO("This is a game type and it cannot be removed at runtime."); return -1; }