games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-09 13:14:02 +02:00
Code Issues Releases Activity

Fix teams switching

Browse Source
This commit is contained in:
nordsoft 2023-04-22 20:38:39 +04:00 committed by Nordsoft91
parent 1de9a57a76
commit 9aaa8c0d89
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mapeditor/windownewmap.cpp
View File

@ -331,7 +331,7 @@ void WindowNewMap::on_humanCombo_activated(int index)
int teams = mapGenOptions.getTeamCount(); int teams = mapGenOptions.getTeamCount();
if(teams > humans - 1) if(teams > humans - 1)
{ {
teams = humans - 1; teams = humans > 0 ? humans - 1 : CMapGenOptions::RANDOM_SIZE;
ui->humanTeamsCombo->setCurrentIndex(teams + 1); //skip one element because first is random ui->humanTeamsCombo->setCurrentIndex(teams + 1); //skip one element because first is random
} }
@ -345,7 +345,7 @@ void WindowNewMap::on_humanCombo_activated(int index)
int cpuTeams = mapGenOptions.getCompOnlyTeamCount(); //comp only players - 1 int cpuTeams = mapGenOptions.getCompOnlyTeamCount(); //comp only players - 1
if(cpuTeams > cpu - 1) if(cpuTeams > cpu - 1)
{ {
cpuTeams = cpu - 1; cpuTeams = cpu > 0 ? cpu - 1 : CMapGenOptions::RANDOM_SIZE;
ui->cpuTeamsCombo->setCurrentIndex(cpuTeams + 1); //skip one element because first is random ui->cpuTeamsCombo->setCurrentIndex(cpuTeams + 1); //skip one element because first is random
} }
@ -368,7 +368,7 @@ void WindowNewMap::on_cpuCombo_activated(int index)
int cpuTeams = mapGenOptions.getCompOnlyTeamCount(); //comp only players - 1 int cpuTeams = mapGenOptions.getCompOnlyTeamCount(); //comp only players - 1
if(cpuTeams > cpu - 1) if(cpuTeams > cpu - 1)
{ {
cpuTeams = cpu - 1; cpuTeams = cpu > 0 ? cpu - 1 : CMapGenOptions::RANDOM_SIZE;
ui->cpuTeamsCombo->setCurrentIndex(cpuTeams + 1); //skip one element because first is random ui->cpuTeamsCombo->setCurrentIndex(cpuTeams + 1); //skip one element because first is random
} }
@ -453,7 +453,7 @@ void WindowNewMap::on_humanTeamsCombo_activated(int index)
int teams = ui->humanTeamsCombo->currentData().toInt(); int teams = ui->humanTeamsCombo->currentData().toInt();
if(teams >= humans) if(teams >= humans)
{ {
teams = humans - 1; teams = humans > 0 ? humans - 1 : CMapGenOptions::RANDOM_SIZE;
ui->humanTeamsCombo->setCurrentIndex(teams + 1); //skip one element because first is random ui->humanTeamsCombo->setCurrentIndex(teams + 1); //skip one element because first is random
} }
@ -465,14 +465,14 @@ void WindowNewMap::on_humanTeamsCombo_activated(int index)
void WindowNewMap::on_cpuTeamsCombo_activated(int index) void WindowNewMap::on_cpuTeamsCombo_activated(int index)
{ {
int cpu = mapGenOptions.getCompOnlyPlayerCount(); int cpu = mapGenOptions.getCompOnlyPlayerCount();
int teams = ui->cpuTeamsCombo->currentData().toInt(); int cpuTeams = ui->cpuTeamsCombo->currentData().toInt();
if(teams >= cpu) if(cpuTeams >= cpu)
{ {
teams = cpu - 1; cpuTeams = cpu > 0 ? cpu - 1 : CMapGenOptions::RANDOM_SIZE;
ui->cpuTeamsCombo->setCurrentIndex(teams + 1); //skip one element because first is random ui->cpuTeamsCombo->setCurrentIndex(cpuTeams + 1); //skip one element because first is random
} }
mapGenOptions.setCompOnlyTeamCount(teams); mapGenOptions.setCompOnlyTeamCount(cpuTeams);
updateTemplateList(); updateTemplateList();
} }