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

- fixes #1086

Browse Source 
- removed outdated code from filesystem. Filesystem.json from 0.89b will no longer work.
This commit is contained in:
Ivan Savenko
2012-09-27 13:23:33 +00:00
parent 572cfa50e7
commit 1fdacc4085
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CAnimation.cpp
View File

@ -956,8 +956,8 @@ void CAnimation::init(CDefFile * file)
BOOST_FOREACH(const JsonNode &frame, group["frames"].Vector()) BOOST_FOREACH(const JsonNode &frame, group["frames"].Vector())
{ {
source[groupID].push_back(frame); source[groupID].push_back(JsonNode());
std::string filename = frame["file"].String(); std::string filename = frame.String();
source[groupID].back()["file"].String() = basepath + filename; source[groupID].back()["file"].String() = basepath + filename;
} }
} }

2
client/GUIClasses.cpp
View File

@ -89,7 +89,7 @@ void CArmyTooltip::init(const InfoAboutArmy &army)
continue; continue;
} }
new CAnimImage("CPRSMALL", slot.second.type->idNumber + 2, 0, slotsPos[slot.first].x, slotsPos[slot.first].y); new CAnimImage("CPRSMALL", slot.second.type->iconIndex, 0, slotsPos[slot.first].x, slotsPos[slot.first].y);
std::string subtitle; std::string subtitle;
if(army.army.isDetailed) if(army.army.isDetailed)

7
lib/Filesystem/CResourceLoader.cpp
View File

@ -385,13 +385,6 @@ void CResourceHandler::loadFileSystem(const std::string &fsConfigURI)
if (entry["type"].String() == "vid") if (entry["type"].String() == "vid")
loadArchive(mountPoint.first, entry, EResType::ARCHIVE_VID); loadArchive(mountPoint.first, entry, EResType::ARCHIVE_VID);
if (entry["type"].String() == "file") // for some compatibility, will be removed for 0.90
{
loadArchive(mountPoint.first, entry, EResType::ARCHIVE_LOD);
loadArchive(mountPoint.first, entry, EResType::ARCHIVE_SND);
loadArchive(mountPoint.first, entry, EResType::ARCHIVE_VID);
}
tlog5 << " took " << timer.getDiff() << " ms.\n"; tlog5 << " took " << timer.getDiff() << " ms.\n";
} }
} }