From 9eee506cf7049afe48fcdfe88b259757955234e5 Mon Sep 17 00:00:00 2001 From: TimePath Date: Wed, 13 May 2015 20:38:03 +1000 Subject: [PATCH] Cleanup infection mutator --- qcsrc/common/mapinfo.qh | 2 +- qcsrc/server/mutators/gamemode_infection.qc | 172 +++++++++----------- 2 files changed, 75 insertions(+), 99 deletions(-) diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 88984fb155..87cc382781 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -87,7 +87,7 @@ REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,true,"timelimit=20 pointl REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,false,"pointlimit=50 teams=0",_("Survive against waves of monsters")); #define g_invasion IS_GAMETYPE(INVASION) -REGISTER_GAMETYPE(_("Infection"),inf,g_infection,INFECTION,TRUE,"timelimit=20",_("Survive against the infection")) +REGISTER_GAMETYPE(_("Infection"),inf,g_infection,INFECTION,true,"timelimit=20",_("Survive against the infection")) #define g_infection IS_GAMETYPE(INFECTION) const int MAPINFO_FEATURE_WEAPONS = 1; // not defined for instagib-only maps diff --git a/qcsrc/server/mutators/gamemode_infection.qc b/qcsrc/server/mutators/gamemode_infection.qc index c0abea32e0..325b3fe001 100644 --- a/qcsrc/server/mutators/gamemode_infection.qc +++ b/qcsrc/server/mutators/gamemode_infection.qc @@ -1,120 +1,107 @@ float autocvar_g_infection_round_timelimit; float autocvar_g_infection_warmup; -float autocvar_g_infection_teams; -float autocvar_g_infection_conversions; +int autocvar_g_infection_teams; +bool autocvar_g_infection_conversions; -float infection_players_count; +int infection_players_count; -.float infectioncolor; -.float infectioncolor_original; +.int infectioncolor; +.int infectioncolor_original; -const float INFECTIONTEAM_NONE = -1; -const float INFECTIONTEAM_UNDEFINED = -2; +const int INFECTIONTEAM_NONE = -1; +const int INFECTIONTEAM_UNDEFINED = -2; // safe team comparisons #define INF_SAMETEAM(a,b) ((a.infectioncolor == b.infectioncolor) ? 1 : 0) #define INF_DIFFTEAM(a,b) ((a.infectioncolor != b.infectioncolor) ? 1 : 0) -void infection_SetColor(entity _e, float _color) +void infection_SetColor(entity e, int _color) { - _e.infectioncolor = _color; - setcolor(_e, (_color << 4) | _color); + e.infectioncolor = _color; + setcolor(e, (_color << 4) | _color); } string color_owner_green, color_owner_red; -// find whose color a player is carrying, TRUE if it's his own, otherwise set color_owner_* to the other owner +// find whose color a player is carrying, true if it's his own, otherwise set color_owner_* to the other owner void infection_GetColorOwner(entity me) { - if (me.infectioncolor == me.infectioncolor_original) - { + if (me.infectioncolor == me.infectioncolor_original) { color_owner_green = "^2your own"; color_owner_red = "^1their own"; return; } entity e; - FOR_EACH_PLAYER(e) - { - if (me.infectioncolor == e.infectioncolor_original) - { - color_owner_green = strcat(e.netname, "^2's"); - color_owner_red = strcat(e.netname, "^1's"); + FOR_EACH_PLAYER(e) { + if (me.infectioncolor == e.infectioncolor_original) { + color_owner_green = sprintf("%s^2's", e.netname); + color_owner_red = sprintf("%s^1's", e.netname); break; } } } -void infection_Assign(float _late) +void infection_Assign(bool late) { - entity e; - if (_late == 0) - { - float infection_coloridx = 0; - FOR_EACH_PLAYER(e) - { - if (infection_coloridx < autocvar_g_infection_teams) // Limit alphas + if (!late) { + int infection_coloridx = 0; + entity e; + FOR_EACH_PLAYER(e) { + if (infection_coloridx < autocvar_g_infection_teams) { // Limit alphas e.infectioncolor_original = infection_coloridx; + } infection_SetColor(e, infection_coloridx++ % bound(0, autocvar_g_infection_teams, 15)); } - } - else - { + } else { // Spawn too late, give player a random color - float color = 15; - float skip = random() * (infection_players_count - 1); // Ignore self - skip = rint(skip); + int color = 15; + int skip = rint(random() * (infection_players_count - 1)); // Ignore self entity e; - FOR_EACH_PLAYER(e) - { + FOR_EACH_PLAYER(e) { if (e == self || IS_OBSERVER(e)) continue; if (!skip --> 0) break; } - dprint(strcat("[INFECTION] copying ", e.netname, "'s color\n")); + dprintf("[INFECTION] copying %s's color\n", e.netname); color = e.infectioncolor; self.infectioncolor_original = INFECTIONTEAM_NONE; // Can't win if player didn't spawn during the round delay infection_SetColor(self, color); } } -float infection_CheckTeams() +bool infection_CheckTeams() { return infection_players_count > 1; } -float infection_CheckWinner() +bool infection_CheckWinner() { - if (infection_players_count <= 1) return FALSE; // There can be no winner + if (infection_players_count <= 1) return false; // There can be no winner - if (0 < round_handler_GetEndTime() && round_handler_GetEndTime() <= time) // Round over - { + if (0 < round_handler_GetEndTime() && round_handler_GetEndTime() <= time) { // Round over Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER); Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER); round_handler_Init(5, autocvar_g_infection_warmup, autocvar_g_infection_round_timelimit); - return TRUE; + return true; } // Check if only one color remains - float previnfectioncolor = -1; - float we_have_a_winner = TRUE; // TRUE until loop below proves us wrong + int previnfectioncolor = -1; + bool we_have_a_winner = true; // until loop below proves us wrong entity e; - FOR_EACH_PLAYER(e) - { + FOR_EACH_PLAYER(e) { // All infection colors are the same if we have a winner - if (previnfectioncolor != -1 && previnfectioncolor != e.infectioncolor) - { + if (previnfectioncolor != -1 && previnfectioncolor != e.infectioncolor) { // In this case we still have more than one color alive - we_have_a_winner = FALSE; + we_have_a_winner = false; break; } previnfectioncolor = e.infectioncolor; } - if (!we_have_a_winner) return FALSE; + if (!we_have_a_winner) return false; // Who is it? - FOR_EACH_PLAYER(e) - { - if (e.infectioncolor == e.infectioncolor_original) - { + FOR_EACH_PLAYER(e) { + if (e.infectioncolor == e.infectioncolor_original) { UpdateFrags(e, 10); // Bonus points Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_PLAYER_WIN, e.netname); Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_PLAYER_WIN, e.netname); @@ -122,12 +109,12 @@ float infection_CheckWinner() } round_handler_Init(5, autocvar_g_infection_warmup, autocvar_g_infection_round_timelimit); - return TRUE; + return true; } void infection_RoundStart() { - infection_Assign(FALSE); + infection_Assign(false); infection_CheckWinner(); } @@ -141,12 +128,12 @@ void inf_Initialize() MUTATOR_HOOKFUNCTION(infection_PlayerDies) { infection_CheckWinner(); - return TRUE; + return true; } MUTATOR_HOOKFUNCTION(infection_RemovePlayer) { - if (!IS_PLAYER(self)) return TRUE; // Wasn't playing + if (!IS_PLAYER(self)) return true; // Wasn't playing infection_players_count--; @@ -154,10 +141,8 @@ MUTATOR_HOOKFUNCTION(infection_RemovePlayer) // Grant alpha status to next of kin entity e; - FOR_EACH_PLAYER(e) - { - if (e.infectioncolor == self.infectioncolor_original) - { + FOR_EACH_PLAYER(e) { + if (e.infectioncolor == self.infectioncolor_original) { e.infectioncolor_original = self.infectioncolor; centerprint(e, "^2You are now an alpha.\n"); break; @@ -165,17 +150,17 @@ MUTATOR_HOOKFUNCTION(infection_RemovePlayer) } infection_CheckWinner(); - return TRUE; + return true; } MUTATOR_HOOKFUNCTION(infection_PlayerSpawn) { - if (self.infectioncolor_original != INFECTIONTEAM_UNDEFINED) return TRUE; // Wasn't observing + if (self.infectioncolor_original != INFECTIONTEAM_UNDEFINED) return true; // Wasn't observing infection_players_count++; - infection_Assign(TRUE); + infection_Assign(true); - return TRUE; + return true; } MUTATOR_HOOKFUNCTION(infection_GiveFragsForKill) @@ -183,61 +168,54 @@ MUTATOR_HOOKFUNCTION(infection_GiveFragsForKill) frag_score = 0; infection_GetColorOwner(frag_attacker); // If this is the first time we die... (our infectioncolor remained unchanged) - if (autocvar_g_infection_conversions && frag_target.infectioncolor == frag_target.infectioncolor_original) - { + if (autocvar_g_infection_conversions && frag_target.infectioncolor == frag_target.infectioncolor_original) { entity e; - FOR_EACH_PLAYER(e) // check other players... - { - if (INF_SAMETEAM(e, frag_target)) // And see if they have our original infection color - { + FOR_EACH_PLAYER(e) { // check other players... + if (INF_SAMETEAM(e, frag_target)) { // And see if they have our original infection color // If so, remove it, our infection color has now "died out" from this round and we can not win anymore. // The attacker will "summon" all of our previously fragged targets, and also us. - centerprint(e, strcat("^1Your alpha ^7", frag_target.netname, "^1 was infected by ^7", frag_attacker.netname, " ^1with ^7", color_owner_red, " ^1color.\n")); + centerprint(e, sprintf("^1Your alpha ^7%s^1 was infected by ^7%s^1 with ^7%s^1 color.\n", + frag_target.netname, frag_attacker.netname, color_owner_red)); infection_SetColor(e, frag_attacker.infectioncolor); frag_score++; } } - } - else - { + } else { infection_SetColor(frag_target, frag_attacker.infectioncolor); frag_score++; } string target = frag_target.netname, attacker = frag_attacker.netname; - centerprint(frag_attacker, strcat("^2You infected ^7", target, " ^2with ^7", color_owner_green, " ^2color.\n")); - centerprint(frag_target, strcat("^1You were infected by ^7", attacker, " ^1with ^7", color_owner_red, " ^1color.\n")); + centerprint(frag_attacker, sprintf("^2You infected ^7%s^2 with ^7%s^2 color.\n", target, color_owner_green)); + centerprint(frag_target, sprintf("^1You were infected by ^7%s^1 with ^7%s^1 color.\n", attacker, color_owner_red)); - bprint("^7", frag_target.netname, "^1 was infected by ^7", attacker, " ^1with ^7", color_owner_red, " ^1color.\n"); + bprint(sprintf("^7%s^1 was infected by ^7%s^1 with ^7%s^1 color.\n", frag_target.netname, attacker, color_owner_red)); - return TRUE; + return true; } MUTATOR_HOOKFUNCTION(infection_PlayerPreThink) { - if (IS_PLAYER(self)) - { + if (IS_PLAYER(self)) { // Prevent cheating by changing player colors infection_SetColor(self, round_handler_IsRoundStarted() ? self.infectioncolor : 15 ); } - return TRUE; + return true; } MUTATOR_HOOKFUNCTION(infection_PlayerDamage_Calculate) { - if ( - IS_PLAYER(frag_attacker) // Allow environment damage - && frag_attacker != frag_target // Allow self damage - && INF_SAMETEAM(frag_attacker, frag_target) // Block friendly fire - ) - { + if (IS_PLAYER(frag_attacker) // Allow environment damage + && frag_attacker != frag_target // Allow self damage + && INF_SAMETEAM(frag_attacker, frag_target) // Block friendly fire + ) { frag_damage = 0; frag_force = '0 0 0'; } - return FALSE; + return false; } MUTATOR_HOOKFUNCTION(infection_BotShouldAttack) @@ -250,7 +228,7 @@ MUTATOR_HOOKFUNCTION(infection_ClientConnect) self.infectioncolor_original = INFECTIONTEAM_UNDEFINED; stuffcmd(self, "settemp cl_forceplayercolors 0\n"); - return FALSE; + return false; } MUTATOR_DEFINITION(gamemode_infection) @@ -265,22 +243,20 @@ MUTATOR_DEFINITION(gamemode_infection) MUTATOR_HOOK(PlayerDamage_Calculate, infection_PlayerDamage_Calculate, CBC_ORDER_ANY); MUTATOR_HOOK(BotShouldAttack, infection_BotShouldAttack, CBC_ORDER_ANY); - MUTATOR_ONADD - { - if(time > 1) // game loads at time 1 + MUTATOR_ONADD { + if(time > 1) { // game loads at time 1 error("This is a game type and it cannot be added at runtime."); + } inf_Initialize(); } - MUTATOR_ONROLLBACK_OR_REMOVE - { + MUTATOR_ONROLLBACK_OR_REMOVE { // we actually cannot roll back inf_Initialize here // BUT: we don't need to! If this gets called, adding always // succeeds. } - MUTATOR_ONREMOVE - { + MUTATOR_ONREMOVE { print("This is a game type and it cannot be removed at runtime."); return -1; } -- 2.39.2