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

Fix build

Browse Source
This commit is contained in:
Ivan Savenko 2024-04-09 18:56:28 +03:00
parent 50e8d1fd82
commit 8aaa9e63dd
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/MetaString.cpp
View File

@ -170,10 +170,13 @@ DLL_LINKAGE std::string MetaString::toString() const
case EMessage::REPLACE_POSITIVE_NUMBER:
if (dst.find("%+d") != std::string::npos)
{
if (numbers[nums] > 0)
boost::replace_first(dst, "%+d", '+' + std::to_string(numbers[nums++]));
int64_t value = numbers[nums];
if (value > 0)
boost::replace_first(dst, "%+d", '+' + std::to_string(value));
else
boost::replace_first(dst, "%+d", std::to_string(numbers[nums++]));
boost::replace_first(dst, "%+d", std::to_string(value));
nums++;
}
else
boost::replace_first(dst, "%d", std::to_string(numbers[nums++]));

2
lib/mapObjects/CGHeroInstance.h
View File

@ -155,8 +155,6 @@ public:
std::string getClassNameTranslated() const;
std::string getClassNameTextID() const;
public:
bool hasSpellbook() const;
int maxSpellLevel() const;
void addSpellToSpellbook(const SpellID & spell);

2
scripting/lua/api/BonusSystem.cpp
View File

@ -143,7 +143,7 @@ int BonusProxy::getDescription(lua_State * L)
std::shared_ptr<const Bonus> object;
if(!S.tryGet(1, object))
return S.retNil();
return LuaStack::quickRetStr(L, object->description);
return LuaStack::quickRetStr(L, object->description.toString());
}
int BonusProxy::toJsonNode(lua_State * L)