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

Merge branch 'develop' into RMG

Browse Source
This commit is contained in:
DjWarmonger 2014-07-01 07:52:46 +02:00
commit 54390ea81c
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/VCMI_client.cbp
View File

@ -101,7 +101,6 @@
<Unit filename="CPreGame.h" /> <Unit filename="CPreGame.h" />
<Unit filename="CQuestLog.cpp" /> <Unit filename="CQuestLog.cpp" />
<Unit filename="CQuestLog.h" /> <Unit filename="CQuestLog.h" />
<Unit filename="CSoundBase.h" />
<Unit filename="CSpellWindow.cpp" /> <Unit filename="CSpellWindow.cpp" />
<Unit filename="CSpellWindow.h" /> <Unit filename="CSpellWindow.h" />
<Unit filename="CVideoHandler.cpp" /> <Unit filename="CVideoHandler.cpp" />

2
lib/CHeroHandler.cpp
View File

@ -199,7 +199,7 @@ void CHeroClassHandler::loadObject(std::string scope, std::string name, const Js
VLC->modh->identifiers.requestIdentifier(scope, "object", "hero", [=](si32 index) VLC->modh->identifiers.requestIdentifier(scope, "object", "hero", [=](si32 index)
{ {
JsonNode classConf; JsonNode classConf = data["mapObject"];
classConf["heroClass"].String() = name; classConf["heroClass"].String() = name;
classConf.setMeta(scope); classConf.setMeta(scope);
VLC->objtypeh->loadSubObject(name, classConf, index, object->id); VLC->objtypeh->loadSubObject(name, classConf, index, object->id);

1
lib/CModHandler.cpp
View File

@ -310,6 +310,7 @@ bool CContentHandler::ContentTypeHandler::preloadModData(std::string modName, st
if (remoteName == modName) if (remoteName == modName)
logGlobal->warnStream() << "Redundant namespace definition for " << objectName; logGlobal->warnStream() << "Redundant namespace definition for " << objectName;
logGlobal->traceStream() << "Patching object " << objectName << " (" << remoteName << ") from " << modName;
JsonNode & remoteConf = modData[remoteName].patches[objectName]; JsonNode & remoteConf = modData[remoteName].patches[objectName];
JsonUtils::merge(remoteConf, entry.second); JsonUtils::merge(remoteConf, entry.second);

1
lib/VCMI_lib.cbp
View File

@ -108,6 +108,7 @@
<Unit filename="CRandomGenerator.cpp" /> <Unit filename="CRandomGenerator.cpp" />
<Unit filename="CRandomGenerator.h" /> <Unit filename="CRandomGenerator.h" />
<Unit filename="CScriptingModule.h" /> <Unit filename="CScriptingModule.h" />
<Unit filename="CSoundBase.h" />
<Unit filename="CSpellHandler.cpp" /> <Unit filename="CSpellHandler.cpp" />
<Unit filename="CSpellHandler.h" /> <Unit filename="CSpellHandler.h" />
<Unit filename="CStopWatch.h" /> <Unit filename="CStopWatch.h" />

5
lib/mapObjects/CObjectClassesHandler.cpp
View File

@ -140,7 +140,7 @@ si32 selectNextID(const JsonNode & fixedID, const Map & map, si32 defaultID)
if (map.empty()) if (map.empty())
return defaultID; // no objects loaded, keep gap for H3M objects return defaultID; // no objects loaded, keep gap for H3M objects
if (map.rbegin()->first > defaultID) if (map.rbegin()->first >= defaultID)
return map.rbegin()->first + 1; // some modded objects loaded, return next available return map.rbegin()->first + 1; // some modded objects loaded, return next available
return defaultID; // some H3M objects loaded, first modded found return defaultID; // some H3M objects loaded, first modded found
@ -173,8 +173,9 @@ void CObjectClassesHandler::loadObjectEntry(const JsonNode & entry, ObjectContai
legacyTemplates.erase(range.first, range.second); legacyTemplates.erase(range.first, range.second);
} }
obj->objects[id] = handler;
logGlobal->debugStream() << "Loaded object " << obj->id << ":" << id; logGlobal->debugStream() << "Loaded object " << obj->id << ":" << id;
assert(!obj->objects.count(id)); // DO NOT override
obj->objects[id] = handler;
} }
CObjectClassesHandler::ObjectContainter * CObjectClassesHandler::loadFromJson(const JsonNode & json) CObjectClassesHandler::ObjectContainter * CObjectClassesHandler::loadFromJson(const JsonNode & json)