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

- fixed uninitialized pointer

Browse Source
This commit is contained in:
Ivan Savenko
2013-04-21 14:08:46 +00:00
parent c6cc6e6301
commit 2ea1051395
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/CTownHandler.cpp
View File

@ -56,6 +56,30 @@ si32 CBuilding::getDistance(BuildingID buildID) const
return -1; return -1;
} }
CFaction::CFaction()
{
}
CFaction::~CFaction()
{
delete town;
}
CTown::CTown()
{
}
CTown::~CTown()
{
BOOST_FOREACH(auto build, buildings)
build.second.dellNull();
BOOST_FOREACH(CStructure * str, clientInfo.structures)
delete str;
}
CTownHandler::CTownHandler() CTownHandler::CTownHandler()
{ {
VLC->townh = this; VLC->townh = this;
@ -554,6 +578,9 @@ CFaction * CTownHandler::loadFromJson(const JsonNode &source)
faction->town->faction = faction; faction->town->faction = faction;
loadTown(*faction->town, source["town"]); loadTown(*faction->town, source["town"]);
} }
else
faction->town = nullptr;
if (!source["puzzleMap"].isNull()) if (!source["puzzleMap"].isNull())
loadPuzzle(*faction, source["puzzleMap"]); loadPuzzle(*faction, source["puzzleMap"]);

6
lib/CTownHandler.h
View File

@ -97,6 +97,9 @@ struct DLL_LINKAGE SPuzzleInfo
class CFaction class CFaction
{ {
public: public:
CFaction();
~CFaction();
std::string name; //town name, by default - from TownName.txt std::string name; //town name, by default - from TownName.txt
TFaction index; TFaction index;
@ -122,6 +125,9 @@ public:
class DLL_LINKAGE CTown class DLL_LINKAGE CTown
{ {
public: public:
CTown();
~CTown();
CFaction * faction; CFaction * faction;
std::vector<std::string> names; //names of the town instances std::vector<std::string> names; //names of the town instances