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

[Map format, PreGame] allow selection of any allowed faction

Browse Source
This commit is contained in:
AlexVinS
2017-11-16 02:06:07 +03:00
parent b8d0dfac5f
commit d7366f04a9
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/CPreGame.cpp
View File

@@ -2367,6 +2367,7 @@ void OptionsTab::nextCastle( PlayerColor player, int dir )
PlayerSettings &s = SEL->sInfo.playerInfos[player]; PlayerSettings &s = SEL->sInfo.playerInfos[player];
si16 &cur = s.castle; si16 &cur = s.castle;
auto & allowed = SEL->current->mapHeader->players[s.color.getNum()].allowedFactions; auto & allowed = SEL->current->mapHeader->players[s.color.getNum()].allowedFactions;
const bool allowRandomTown = SEL->current->mapHeader->players[s.color.getNum()].isFactionRandom;
if (cur == PlayerSettings::NONE) //no change if (cur == PlayerSettings::NONE) //no change
return; return;
@@ -2381,9 +2382,20 @@ void OptionsTab::nextCastle( PlayerColor player, int dir )
} }
else // next/previous available else // next/previous available
{ {
if ( (cur == *allowed.begin() && dir < 0 ) if((cur == *allowed.begin() && dir < 0 ) || (cur == *allowed.rbegin() && dir > 0))
|| (cur == *allowed.rbegin() && dir > 0) ) {
cur = -1; if(allowRandomTown)
{
cur = PlayerSettings::RANDOM;
}
else
{
if (dir > 0)
cur = *allowed.begin();
else
cur = *allowed.rbegin();
}
}
else else
{ {
assert(dir >= -1 && dir <= 1); //othervice std::advance may go out of range assert(dir >= -1 && dir <= 1); //othervice std::advance may go out of range
@@ -2699,8 +2711,9 @@ void OptionsTab::PlayerOptionsEntry::selectButtons()
if(!btns[0]) if(!btns[0])
return; return;
if( (pi.defaultCastle() != -1) //fixed tow const bool foreignPlayer = SEL->isGuest() && s.color != playerColor;
|| (SEL->isGuest() && s.color != playerColor)) //or not our player
if( (pi.allowedFactions.size() < 2 && !pi.isFactionRandom) || foreignPlayer)
{ {
btns[0]->disable(); btns[0]->disable();
btns[1]->disable(); btns[1]->disable();
@@ -2712,7 +2725,7 @@ void OptionsTab::PlayerOptionsEntry::selectButtons()
} }
if( (pi.defaultHero() != -1 || !s.playerID || s.castle < 0) //fixed hero if( (pi.defaultHero() != -1 || !s.playerID || s.castle < 0) //fixed hero
|| (SEL->isGuest() && s.color != playerColor))//or not our player || foreignPlayer)//or not our player
{ {
btns[2]->disable(); btns[2]->disable();
btns[3]->disable(); btns[3]->disable();
@@ -2723,7 +2736,7 @@ void OptionsTab::PlayerOptionsEntry::selectButtons()
btns[3]->enable(); btns[3]->enable();
} }
if(SEL->isGuest() && s.color != playerColor)//or not our player if(foreignPlayer)
{ {
btns[4]->disable(); btns[4]->disable();
btns[5]->disable(); btns[5]->disable();

14
lib/mapping/CMap.cpp
View File

@@ -36,14 +36,14 @@ PlayerInfo::PlayerInfo(): canHumanPlay(false), canComputerPlay(false),
si8 PlayerInfo::defaultCastle() const si8 PlayerInfo::defaultCastle() const
{ {
if(allowedFactions.size() == 1 || !isFactionRandom) //if random allowed set it as default
{ if(isFactionRandom)
// faction can't be chosen - set to first that is marked as allowed return -1;
assert(!allowedFactions.empty());
return *allowedFactions.begin();
}
// set to random if(!allowedFactions.empty())
return *allowedFactions.begin();
// fall back to random
return -1; return -1;
} }