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

Fixed unitialized ptrs in CArtifacts.

Browse Source 
Parsing for adventure map def for artifacts.
This commit is contained in:
DjWarmonger
2012-12-16 11:35:14 +00:00
parent c764ce6ebe
commit 99e7177d57
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CArtHandler.cpp
View File

@@ -171,6 +171,8 @@ CArtifact::CArtifact()
possibleSlots[ArtBearer::HERO]; //we want to generate map entry even if it will be empty
possibleSlots[ArtBearer::CREATURE]; //we want to generate map entry even if it will be empty
possibleSlots[ArtBearer::COMMANDER];
constituents = NULL; //default pointer to zero
constituentOf = NULL;
}
CArtifact::~CArtifact()
@@ -333,7 +335,6 @@ void CArtHandler::loadArtifacts(bool onlyTxt)
continue;
// Fill in information about combined artifacts. Should perhaps be moved to a config file?
nart.constituentOf = NULL;
switch (nart.id)
{
case 129: // Angelic Alliance
@@ -399,7 +400,6 @@ void CArtHandler::loadArtifacts(bool onlyTxt)
// TODO: WoG combinationals
default:
nart.constituents = NULL;
break;
}
@@ -476,6 +476,7 @@ CArtifact * CArtHandler::loadArtifact(const JsonNode & node)
value = &graphics["large"];
if (!value->isNull())
art->large = value->String();
art->advMapDef = graphics["map"].String();
art->price = node["value"].Float();