1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00

- music player uses URI's instead of enum from music base

- #1045 and #1046 should be fixed
- moved pregame backgrounds to config/mainmenu
- animation can be overriden with .json multiple times
This commit is contained in:
Ivan Savenko
2012-08-06 07:34:37 +00:00
parent 385be09248
commit 708ad6ac7f
24 changed files with 212 additions and 256 deletions

View File

@ -560,8 +560,7 @@ void CGeneralTextHandler::load()
zcrexp.push_back(nameBuf);
}
std::string threatLevelDir = GameConstants::DATA_DIR + "/config/threatlevel.txt";
std::ifstream ifs(threatLevelDir.c_str(), std::ios::in | std::ios::binary);
std::ifstream ifs(CResourceHandler::get()->getResourceName(ResourceID("config/threatlevel.txt")), std::ios::binary);
getline(ifs, buf); //skip 1st line
for (int i = 0; i < 13; ++i)
{