1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00

Next part of town configuration:

- town screen is mostly implemented, has some minor issues
- factions are now separate from towns, neutrals have faction with id=9
- more constants to GameConstants: town-specific buildings, strings for terrains and resources
- replaced most access to builtBuildings with isBuilt() method
- replaced id's with enums for town subtype and buildings id's
This commit is contained in:
Ivan Savenko
2012-09-05 12:49:23 +00:00
parent 44cc848edc
commit 0ca9f64573
36 changed files with 1475 additions and 1471 deletions

View File

@ -329,8 +329,6 @@ CMusicHandler::CMusicHandler():
const std::string setEnemy[] = {"AITheme0", "AITheme1", "AITheme2"};
const std::string setBattle[] = {"Combat01", "Combat02", "Combat03", "Combat04"};
const std::string setTerrain[] = {"Dirt", "Sand", "Grass", "Snow", "Swamp", "Rough", "Underground", "Lava", "Water"};
const std::string setTowns[] = {"CstleTown", "Rampart", "TowerTown", "InfernoTown",
"NecroTown", "Dungeon", "Stronghold", "FortressTown", "ElemTown"};
auto fillSet = [=](std::string setName, const std::string list[], size_t amount)
{
@ -340,7 +338,6 @@ CMusicHandler::CMusicHandler():
fillSet("enemy-turn", setEnemy, ARRAY_COUNT(setEnemy));
fillSet("battle", setBattle, ARRAY_COUNT(setBattle));
fillSet("terrain", setTerrain, ARRAY_COUNT(setTerrain));
fillSet("town-theme", setTowns, ARRAY_COUNT(setTowns));
}
void CMusicHandler::addEntryToSet(std::string set, int musicID, std::string musicURI)