X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=587b1ec54cef0cac9c4be7447d1961d89c67a974;hb=75adb82c845a486aafb6b65a23ff31ff8fde39cc;hp=12f25fad50c26d31204b84510628a9d81ea99e37;hpb=526256220aa1c46ff61799f2ca68a33b1451b503;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index 12f25fad5..587b1ec54 100644 --- a/qcsrc/server/arena.qc +++ b/qcsrc/server/arena.qc @@ -8,7 +8,6 @@ float arena_roundbased; entity spawnqueue_first; entity spawnqueue_last; entity champion; -string champion_name; float warmup; float ca_players; float required_ca_players; @@ -41,15 +40,15 @@ void reset_map(float dorespawn) entity oldself; oldself = self; - if(g_arena && cvar("g_arena_warmup")) - warmup = time + cvar("g_arena_warmup"); + if(g_arena && autocvar_g_arena_warmup) + warmup = time + autocvar_g_arena_warmup; else if(g_ca) { - warmup = time + cvar("g_ca_warmup"); + warmup = time + autocvar_g_ca_warmup; allowed_to_spawn = 1; } else if(g_freezetag) { - warmup = time + cvar("g_freezetag_warmup"); + warmup = time + autocvar_g_freezetag_warmup; } lms_lowest_lives = 999; @@ -70,10 +69,7 @@ void reset_map(float dorespawn) self.team = self.team_saved; if(self.flags & FL_PROJECTILE) // remove any projectiles left - { - stopsound(self, CHAN_PAIN); remove(self); - } } // Waypoints and assault start come LAST @@ -137,7 +133,7 @@ void reset_map(float dorespawn) } if(g_keyhunt) - kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_round")+(game_starttime - time), "", kh_StartRound); + kh_Controller_SetThink_NoMsg(autocvar_g_balance_keyhunt_delay_round+(game_starttime - time), kh_StartRound); if(g_arena) if(champion && champion.classname == "player" && player_count > 1) @@ -207,14 +203,12 @@ float roundStartTime_prev; // prevent networkspam void Arena_Warmup() { float f; - string msg; + entity e; if((!g_arena && !g_ca && !g_freezetag) || (g_arena && !arena_roundbased) || (time < game_starttime)) return; f = ceil(warmup - time); - if(f > 0) - champion = world; // this is done because a if(champion) will not execute if champion = world allowed_to_spawn = 0; @@ -223,18 +217,17 @@ void Arena_Warmup() if(ca_players < required_ca_players) allowed_to_spawn = 1; - msg = NEWLINES; if(time < warmup && !inWarmupStage) { if (g_ca) allowed_to_spawn = 1; if(champion && g_arena) - msg = strcat("The Champion is ", champion_name, "^7\n"); - //centerprint(self, strcat(msg, "The Champion is ", champion.netname, "^7\n")); + { + FOR_EACH_PLAYER(e) + centerprint(e, strcat("The Champion is ", champion.netname)); + } if(f != roundStartTime_prev) { - msg = strcat(msg, "Round will start in ", ftos(f),"\n"); - //centerprint(self, strcat("Round will start in ", ftos(f),"\n")); roundStartTime_prev = f; if(f == 5) Announce("prepareforbattle"); @@ -245,7 +238,8 @@ void Arena_Warmup() else if(f == 1) Announce("1"); - centerprint(self, msg); + FOR_EACH_PLAYER(e) + Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "Round will start in %d", 1, f); } if (g_arena) { @@ -255,26 +249,30 @@ void Arena_Warmup() self.velocity = '0 0 0'; self.avelocity = '0 0 0'; self.movement = '0 0 0'; - //self.fixangle = TRUE; } } - else if(f > -1 && f != roundStartTime_prev) { roundStartTime_prev = f; Announce("begin"); - centerprint(self, "^1Begin!\n"); + FOR_EACH_PLAYER(e) + Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "^1Begin!", 1, 0); if(g_ca) { ca_players = 0; - FOR_EACH_PLAYER(self) + FOR_EACH_PLAYER(e) ca_players += 1; } + + if(self.classname == "player" && self.health > 0 && self.movetype == MOVETYPE_NONE) + self.movetype = MOVETYPE_WALK; + } - if(self.classname == "player" && self.health > 0 && self.movetype == MOVETYPE_NONE) - self.movetype = MOVETYPE_WALK; + // clear champion to avoid centerprinting again the champion msg + if (champion) + champion = world; } void count_spawned_players() @@ -326,7 +324,7 @@ void count_alive_players() totalalive += 1; } } - FOR_EACH_PLAYER(self) { + FOR_EACH_REALCLIENT(self) { self.redalive_stat = redalive; self.bluealive_stat = bluealive; } @@ -356,7 +354,7 @@ void count_alive_players() totalalive += 1; } } - FOR_EACH_PLAYER(self) { + FOR_EACH_REALCLIENT(self) { self.redalive_stat = redalive; self.bluealive_stat = bluealive; self.yellowalive_stat = yellowalive; @@ -373,6 +371,7 @@ void count_alive_players() * * Gets called in StartFrame() */ +float warntime; void Spawnqueue_Check() { count_spawned_players(); @@ -384,26 +383,26 @@ void Spawnqueue_Check() return; if(g_ca) { - required_ca_players = max(2, fabs(cvar("bot_vs_human") + 1)); + required_ca_players = max(2, fabs(autocvar_bot_vs_human + 1)); if(ca_players < required_ca_players && (redspawned && bluespawned)) { reset_map(TRUE); } else if(ca_players < required_ca_players) { - FOR_EACH_PLAYER(self) - centerprint(self, strcat("^1Need at least 1 player in each team to play CA", "^7\n")); + if (time > warntime) + { + FOR_EACH_PLAYER(self) + Send_CSQC_Centerprint_Generic(self, CPID_ROUND_STARTING, "^1Need at least 1 player in each team to play CA", 2, 0); + warntime = time + 1; + } return; } else if(!next_round) { if((redspawned && !bluespawned) || (bluespawned && !redspawned)) { next_round = time + 5; - champion = find(world, classname, "player"); - if(champion_name) - strunzone(champion_name); - champion_name = strzone(champion.netname); } - else if((!redspawned && !bluespawned) || time - warmup > cvar("g_ca_round_timelimit")) { - FOR_EACH_CLIENT(self) centerprint(self, strcat("^7Round tied.", "^7\n")); + else if((!redspawned && !bluespawned) || time - warmup > autocvar_g_ca_round_timelimit) { + FOR_EACH_CLIENT(self) centerprint(self, "^7Round tied"); next_round = time + 5; } @@ -413,14 +412,14 @@ void Spawnqueue_Check() if(redalive && !bluealive) { play2all("ctf/red_capture.wav"); - FOR_EACH_CLIENT(self) centerprint(self, "^1 RED ^7team wins the round.\n"); + FOR_EACH_CLIENT(self) centerprint(self, "^1RED ^7team wins the round"); TeamScore_AddToTeam(COLOR_TEAM1, ST_SCORE, +1); stopalivecheck = TRUE; } else if(bluealive && !redalive) { play2all("ctf/blue_capture.wav"); - FOR_EACH_CLIENT(self) centerprint(self, "^4 BLUE ^7team wins the round.\n"); + FOR_EACH_CLIENT(self) centerprint(self, "^4BLUE ^7team wins the round"); TeamScore_AddToTeam(COLOR_TEAM2, ST_SCORE, +1); stopalivecheck = TRUE; }