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

Fixed mapping of hota objects

Browse Source
This commit is contained in:
Ivan Savenko 2023-05-25 19:35:21 +03:00
parent 952708e865
commit 312b703a78
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/mapObjects/CRewardableConstructor.cpp
View File

@ -57,6 +57,7 @@ void CRewardableConstructor::configureObject(CGObjectInstance * object, CRandomG
rewardInfo.reward.extraComponents.emplace_back(Component::EComponentType::LUCK, 0, bonus.val, 0); rewardInfo.reward.extraComponents.emplace_back(Component::EComponentType::LUCK, 0, bonus.val, 0);
} }
} }
assert(!rewardableObject->configuration.info.empty());
} }
} }

3
lib/mapObjects/CommonConstructors.cpp
View File

@ -338,7 +338,8 @@ CGObjectInstance * MarketInstanceConstructor::create(std::shared_ptr<const Objec
if(!title.empty()) if(!title.empty())
market->title = VLC->generaltexth->translate(title); market->title = VLC->generaltexth->translate(title);
market->speech = VLC->generaltexth->translate(speech); if (!speech.empty())
market->speech = VLC->generaltexth->translate(speech);
return market; return market;
} }

3
lib/mapping/MapFormatH3M.cpp
View File

@ -922,8 +922,7 @@ void CMapLoaderH3M::readObjectTemplates()
// Read custom defs // Read custom defs
for(int defID = 0; defID < defAmount; ++defID) for(int defID = 0; defID < defAmount; ++defID)
{ {
auto tmpl = std::make_shared<ObjectTemplate>(); auto tmpl = reader->readObjectTemplate();
tmpl->readMap(reader->getInternalReader());
templates.push_back(tmpl); templates.push_back(tmpl);
if (!CResourceHandler::get()->existsResource(ResourceID( "SPRITES/" + tmpl->animationFile, EResType::ANIMATION))) if (!CResourceHandler::get()->existsResource(ResourceID( "SPRITES/" + tmpl->animationFile, EResType::ANIMATION)))

4
lib/mapping/MapIdentifiersH3M.cpp
View File

@ -54,8 +54,8 @@ void MapIdentifiersH3M::loadMapping(const JsonNode & mapping)
for (auto entryTemplate : mapping["templates"].Struct()) for (auto entryTemplate : mapping["templates"].Struct())
{ {
std::string h3mName = entryTemplate.second.String(); std::string h3mName = boost::to_lower_copy(entryTemplate.second.String());
std::string vcmiName = entryTemplate.first; std::string vcmiName = boost::to_lower_copy(entryTemplate.first);
if (!CResourceHandler::get()->existsResource(ResourceID( "SPRITES/" + vcmiName, EResType::ANIMATION))) if (!CResourceHandler::get()->existsResource(ResourceID( "SPRITES/" + vcmiName, EResType::ANIMATION)))
logMod->warn("Template animation file %s was not found!", vcmiName); logMod->warn("Template animation file %s was not found!", vcmiName);

9
lib/mapping/MapReaderH3M.cpp
View File

@ -13,6 +13,7 @@
#include "../filesystem/CBinaryReader.h" #include "../filesystem/CBinaryReader.h"
#include "../int3.h" #include "../int3.h"
#include "../mapObjects/ObjectTemplate.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
@ -315,6 +316,14 @@ int3 MapReaderH3M::readInt3()
return p; return p;
} }
std::shared_ptr<ObjectTemplate> MapReaderH3M::readObjectTemplate()
{
auto tmpl = std::make_shared<ObjectTemplate>();
tmpl->readMap(*reader);
remapper.remapTemplate(*tmpl);
return tmpl;
}
void MapReaderH3M::skipUnused(size_t amount) void MapReaderH3M::skipUnused(size_t amount)
{ {
reader->skip(amount); reader->skip(amount);

2
lib/mapping/MapReaderH3M.h
View File

@ -59,6 +59,8 @@ public:
int3 readInt3(); int3 readInt3();
std::shared_ptr<ObjectTemplate> readObjectTemplate();
void skipUnused(size_t amount); void skipUnused(size_t amount);
void skipZero(size_t amount); void skipZero(size_t amount);