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

post-merge fixes

Browse Source
This commit is contained in:
AlexVinS
2015-12-05 13:56:38 +03:00
parent 947edc0693
commit f33bcee84c
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapping/MapFormatJson.cpp
View File

@@ -21,6 +21,9 @@
#include "../mapObjects/ObjectTemplate.h"
#include "../mapObjects/CObjectHandler.h"
#include "../mapObjects/CObjectClassesHandler.h"
#include "../mapObjects/CGHeroInstance.h"
#include "../mapObjects/CGTownInstance.h"
#include "../StringConstants.h"
namespace TriggeredEventsDetail
@@ -606,7 +609,7 @@ void CMapLoaderJson::MapObjectLoader::configure()
if(instance->ID == Obj::HERO)
{
logGlobal->debugStream() << "Hero: " << VLC->heroh->heroes[instance->subID]->name << " at " << instance->pos;
owner->map->heroesOnMap.push_back(static_cast<CGHeroInstance*>(instance));
owner->map->heroesOnMap.push_back(static_cast<CGHeroInstance *>(instance));
}
}