mirror of
https://github.com/bearstonem/openmohaa-vr.git
synced 2026-10-23 19:00:25 +02:00
Fix roundlimit variable ignored on ToW
This commit is contained in:
1 file changed
+9
-1
@@ -1197,7 +1197,7 @@ bool DM_Manager::CheckEndMatch()
|
||||
if (!g_TOW_winstate || !g_TOW_winstate->integer) {
|
||||
int roundLimit = GetRoundLimit();
|
||||
|
||||
if (!level.m_bIgnoreClock && roundLimit > 0 && level.time >= m_iDefaultRoundLimit * 60 + m_fRoundTime) {
|
||||
if (!level.m_bIgnoreClock && roundLimit > 0 && level.time >= roundLimit * 60 + m_fRoundTime) {
|
||||
switch (m_csTeamClockSide) {
|
||||
case STRING_AXIS:
|
||||
gi.cvar_set("g_TOW_winstate", "1");
|
||||
@@ -1322,6 +1322,10 @@ bool DM_Manager::CheckEndMatch()
|
||||
DM_Team *pBombTeam;
|
||||
DM_Team *pNonBombTeam;
|
||||
|
||||
//
|
||||
// Respawns not allowed, at this point a team is fully dead
|
||||
//
|
||||
|
||||
if (g_gametype->integer != GT_OBJECTIVE) {
|
||||
EndRound();
|
||||
return true;
|
||||
@@ -1332,6 +1336,10 @@ bool DM_Manager::CheckEndMatch()
|
||||
return true;
|
||||
}
|
||||
|
||||
//
|
||||
// Check to end the round if no bomb is planted
|
||||
//
|
||||
|
||||
if (m_csTeamBombPlantSide == STRING_AXIS) {
|
||||
pBombTeam = &m_team_axis;
|
||||
pNonBombTeam = &m_team_allies;
|
||||
|
||||
Reference in new issue
Block a user