games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

fix build

Browse Source
This commit is contained in:
SoundSSGood
2023-06-30 21:02:57 +03:00
parent aa90433418
commit 11a109f3af
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ArtifactUtils.cpp
View File

@@ -219,7 +219,7 @@ DLL_LINKAGE CArtifactInstance * ArtifactUtils::createArtifact(CMap * map, const
return art; return art;
} }
DLL_LINKAGE void ArtifactUtils::insertScrrollSpellName(std::string & description, SpellID & sid) DLL_LINKAGE void ArtifactUtils::insertScrrollSpellName(std::string & description, const SpellID & sid)
{ {
// We expect scroll description to be like this: This scroll contains the [spell name] spell which is added // We expect scroll description to be like this: This scroll contains the [spell name] spell which is added
// into spell book for as long as hero carries the scroll. So we want to replace text in [...] with a spell name. // into spell book for as long as hero carries the scroll. So we want to replace text in [...] with a spell name.

2
lib/ArtifactUtils.h
View File

@@ -41,7 +41,7 @@ namespace ArtifactUtils
DLL_LINKAGE CArtifactInstance * createNewArtifactInstance(CArtifact * art); DLL_LINKAGE CArtifactInstance * createNewArtifactInstance(CArtifact * art);
DLL_LINKAGE CArtifactInstance * createNewArtifactInstance(const ArtifactID & aid); DLL_LINKAGE CArtifactInstance * createNewArtifactInstance(const ArtifactID & aid);
DLL_LINKAGE CArtifactInstance * createArtifact(CMap * map, const ArtifactID & aid, int spellID = -1); DLL_LINKAGE CArtifactInstance * createArtifact(CMap * map, const ArtifactID & aid, int spellID = -1);
DLL_LINKAGE void insertScrrollSpellName(std::string & description, SpellID & sid); DLL_LINKAGE void insertScrrollSpellName(std::string & description, const SpellID & sid);
} }
VCMI_LIB_NAMESPACE_END VCMI_LIB_NAMESPACE_END

4
lib/CArtifactInstance.cpp
View File

@@ -15,6 +15,8 @@
#include "CArtHandler.h" #include "CArtHandler.h"
#include "NetPacksBase.h" #include "NetPacksBase.h"
VCMI_LIB_NAMESPACE_BEGIN
void CCombinedArtifactInstance::addArtInstAsPart(CArtifactInstance * art, const ArtifactPosition & slot) void CCombinedArtifactInstance::addArtInstAsPart(CArtifactInstance * art, const ArtifactPosition & slot)
{ {
auto artInst = static_cast<CArtifactInstance*>(this); auto artInst = static_cast<CArtifactInstance*>(this);
@@ -165,3 +167,5 @@ void CArtifactInstance::deserializationFix()
for(PartInfo & part : partsInfo) for(PartInfo & part : partsInfo)
attachTo(*part.art); attachTo(*part.art);
} }
VCMI_LIB_NAMESPACE_END