Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed TeamHitScoreLimit() (should use m_teamwins)

Browse source
This commit is contained in:
smallmodel 2023-08-19 19:34:12 +02:00
parent 8cfa909b73
commit d22cda594f
No known key found for this signature in database
GPG key ID: A96F163ED4891440
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
code/fgame/dm_manager.cpp
View file

@ -268,7 +268,7 @@ void DM_Team::AddKills(Player *player, int numKills)
if (m_teamnumber > TEAM_FREEFORALL) {
m_iKills += numKills;
if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE) {
if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW) || g_gametype->integer == GT_LIBERATION) {
player->AddDeaths(numKills);
} else {
m_teamwins += numKills;
@ -282,7 +282,7 @@ void DM_Team::AddDeaths(Player *player, int numDeaths)
return;
}
if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE) {
if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW) || g_gametype->integer == GT_LIBERATION) {
return;
}
@ -1116,11 +1116,16 @@ void DM_Manager::InitGame(void)
if (g_gametype->integer >= 0 && g_gametype->integer < GT_MAX_GAME_TYPE) {
if (g_gametype->integer <= GT_TEAM) {
m_bAllowRespawns = qtrue;
m_bRoundBasedGame = qfalse;
m_bAllowRespawns = true;
m_bRoundBasedGame = false;
} else {
m_bAllowRespawns = qfalse;
m_bRoundBasedGame = qtrue;
if (g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
m_bAllowRespawns = true;
m_bRoundBasedGame = true;
} else {
m_bAllowRespawns = false;
m_bRoundBasedGame = true;
}
g_tempaxisscore = gi.Cvar_Get("g_tempaxisscore", "0", 0);
g_tempaxiswinsinrow = gi.Cvar_Get("g_tempaxiswinsinrow", "0", 0);
@ -1354,7 +1359,7 @@ bool DM_Manager::TeamHitScoreLimit(void)
}
for (int i = 1; i <= m_teams.NumObjects(); i++) {
if (m_teams.ObjectAt(i)->m_iKills >= fraglimit->integer) {
if (m_teams.ObjectAt(i)->m_teamwins >= fraglimit->integer) {
return true;
}
}
@ -1428,7 +1433,7 @@ void DM_Manager::EventDoRoundTransition(Event *ev)
Unregister(STRING_AXISWIN);
} else if (m_iTeamWin == TEAM_ALLIES) {
G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Allies win!\n")));
G_PrintToAllClients(va("\%s\n", gi.LV_ConvertString("Allies win!\n")));
G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Allies win!\n")));
// Play the allies victory sound
world->Sound("dfr_victory_v");