games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

- fixed some bugs with artifacts icons

Browse Source
This commit is contained in:
Ivan Savenko
2013-05-31 11:46:19 +00:00
parent 3fbcf86dec
commit 1c0ccd2b02
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CArtHandler.cpp
View File

@@ -199,10 +199,10 @@ void CArtHandler::loadObject(std::string scope, std::string name, const JsonNode
{
auto object = loadFromJson(data);
object->id = ArtifactID(artifacts.size());
if (object->id < ArtifactID::ART_SELECTION)
//if (object->id < ArtifactID::ART_SELECTION)
object->iconIndex = object->id;
else
object->iconIndex = object->id + 2;
//else
// object->iconIndex = object->id + 2;
artifacts.push_back(object);
@@ -213,10 +213,10 @@ void CArtHandler::loadObject(std::string scope, std::string name, const JsonNode
{
auto object = loadFromJson(data);
object->id = ArtifactID(index);
if (object->id < ArtifactID::ART_SELECTION)
//if (object->id < ArtifactID::ART_SELECTION)
object->iconIndex = object->id;
else
object->iconIndex = object->id + 2;
//else
// object->iconIndex = object->id + 2;
assert(artifacts[index] == nullptr); // ensure that this id was not loaded before
artifacts[index] = object;