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

Code style: uncrustify formatting preview

Browse Source
This commit is contained in:
Arseniy Shestakov
2017-07-20 02:50:47 +03:00
parent 456e9fe405
commit 58f32f6dc2
411 changed files with 35164 additions and 33446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CBuildingHandler.cpp
View File

@ -10,9 +10,9 @@
#include "StdInc.h"
#include "CBuildingHandler.h"
BuildingID CBuildingHandler::campToERMU( int camp, int townType, std::set<BuildingID> builtBuildings )
BuildingID CBuildingHandler::campToERMU(int camp, int townType, std::set<BuildingID> builtBuildings)
{
static const std::vector<BuildingID> campToERMU =
static const std::vector<BuildingID> campToERMU =
{
BuildingID::TOWN_HALL, BuildingID::CITY_HALL,
BuildingID::CAPITOL, BuildingID::FORT, BuildingID::CITADEL, BuildingID::CASTLE, BuildingID::TAVERN,
@ -20,21 +20,21 @@ BuildingID CBuildingHandler::campToERMU( int camp, int townType, std::set<Buildi
BuildingID::MAGES_GUILD_1, BuildingID::MAGES_GUILD_2, BuildingID::MAGES_GUILD_3, BuildingID::MAGES_GUILD_4,
BuildingID::MAGES_GUILD_5,
BuildingID::SHIPYARD, BuildingID::GRAIL,
BuildingID::SPECIAL_1, BuildingID::SPECIAL_2, BuildingID::SPECIAL_3, BuildingID::SPECIAL_4
BuildingID::SPECIAL_1, BuildingID::SPECIAL_2, BuildingID::SPECIAL_3, BuildingID::SPECIAL_4
}; //creature generators with banks - handled separately
if (camp < campToERMU.size())
if(camp < campToERMU.size())
{
return campToERMU[camp];
}
static const std::vector<int> hordeLvlsPerTType[GameConstants::F_NUMBER] =
static const std::vector<int> hordeLvlsPerTType[GameConstants::F_NUMBER] =
{
{2}, {1}, {1,4}, {0,2}, {0}, {0}, {0}, {0}, {0}
{2}, {1}, {1, 4}, {0, 2}, {0}, {0}, {0}, {0}, {0}
};
int curPos = campToERMU.size();
for (int i=0; i<GameConstants::CREATURES_PER_TOWN; ++i)
for(int i = 0; i < GameConstants::CREATURES_PER_TOWN; ++i)
{
if(camp == curPos) //non-upgraded
return BuildingID(30 + i);
@ -43,13 +43,13 @@ BuildingID CBuildingHandler::campToERMU( int camp, int townType, std::set<Buildi
return BuildingID(37 + i);
curPos++;
if (i < 5) // last two levels don't have reserved horde ID. Yet another H3C weirdeness
if(i < 5) // last two levels don't have reserved horde ID. Yet another H3C weirdeness
{
if (vstd::contains(hordeLvlsPerTType[townType], i))
if(vstd::contains(hordeLvlsPerTType[townType], i))
{
if (camp == curPos)
if(camp == curPos)
{
if (hordeLvlsPerTType[townType][0] == i)
if(hordeLvlsPerTType[townType][0] == i)
{
if(vstd::contains(builtBuildings, 37 + hordeLvlsPerTType[townType][0])) //if upgraded dwelling is built
return BuildingID::HORDE_1_UPGR;
@ -74,4 +74,3 @@ BuildingID CBuildingHandler::campToERMU( int camp, int townType, std::set<Buildi
assert(0);
return BuildingID::NONE; //not found
}