games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

- fixed crash on start of some campaigns

Browse Source 
- allowed on map factions is now set instead of bit field
This commit is contained in:
Ivan Savenko
2012-09-23 14:32:49 +00:00
parent 00c079f7dc
commit 3fcba4fb5c
10 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/CPreGame.cpp
View File

@@ -1914,41 +1914,30 @@ void OptionsTab::nextCastle( int player, int dir )
PlayerSettings &s = SEL->sInfo.playerInfos[player];
si32 &cur = s.castle;
ui32 allowed = SEL->current->mapHeader->players[s.color].allowedFactions;
auto & allowed = SEL->current->mapHeader->players[s.color].allowedFactions;
if (cur == -2) //no castle - no change
return;
if (cur == -1) //random => first/last available
{
int pom = (dir>0) ? (0) : (GameConstants::F_NUMBER-1); // last or first
for (;pom >= 0 && pom < GameConstants::F_NUMBER; pom+=dir)
{
if((1 << pom) & allowed)
{
cur=pom;
break;
}
}
if (dir > 0)
cur = *allowed.begin(); //id of first town
else
cur = *allowed.rbegin(); //id of last town
}
else // next/previous available
{
for (;;)
if ( (cur == *allowed.begin() && dir < 0 )
|| (cur == *allowed.rbegin() && dir > 0) )
cur = -1;
else
{
cur+=dir;
if ((1 << cur) & allowed)
break;
if (cur >= GameConstants::F_NUMBER || cur<0)
{
double p1 = log((double)allowed) / log(2.0)+0.000001;
double check = p1 - ((int)p1);
if (check < 0.001)
cur = (int)p1;
else
cur = -1;
break;
}
assert(dir >= -1 && dir <= 1); //othervice std::advance may go out of range
auto iter = allowed.find(cur);
std::advance(iter, dir);
cur = *iter;
}
}