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

Merge pull request #2252 from SoundSSGood/crash_fix

Browse Source 
Crash fix. Cosmetic fixes.
This commit is contained in:
Ivan Savenko 2023-06-26 23:06:20 +03:00 committed by GitHub
commit 33cbd46406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ArtifactUtils.cpp
View File

@ -204,7 +204,7 @@ DLL_LINKAGE CArtifactInstance * ArtifactUtils::createArtifact(CMap * map, const
art = ArtifactUtils::createScroll(SpellID(spellID));
}
}
else //TODO: create combined artifact instance for random artifacts, just in case
else
{
art = new CArtifactInstance(); // random, empty
}

11
lib/CArtHandler.cpp
View File

@ -819,9 +819,6 @@ void CArtifactInstance::init()
std::string CArtifactInstance::getDescription() const
{
std::string text = artType->getDescriptionTranslated();
if (!vstd::contains(text, '{'))
text = '{' + artType->getNameTranslated() + "}\n\n" + text; //workaround for new artifacts with single name, turns it to H3-style
if(artType->getId() == ArtifactID::SPELL_SCROLL)
{
// we expect scroll description to be like this: This scroll contains the [spell name] spell which is added into your spell book for as long as you carry the scroll.
@ -849,12 +846,12 @@ bool CArtifactInstance::canBePutAt(const ArtifactLocation & al, bool assumeDestR
return artType->canBePutAt(al.getHolderArtSet(), al.slot, assumeDestRemoved);
}
void CArtifactInstance::putAt(ArtifactLocation al)
void CArtifactInstance::putAt(const ArtifactLocation & al)
{
al.getHolderArtSet()->putArtifact(al.slot, this);
}
void CArtifactInstance::removeFrom(ArtifactLocation al)
void CArtifactInstance::removeFrom(const ArtifactLocation & al)
{
al.getHolderArtSet()->removeArtifact(al.slot);
}
@ -917,7 +914,7 @@ void CCombinedArtifactInstance::addAsConstituent(CArtifactInstance * art, const
attachTo(*art);
}
void CCombinedArtifactInstance::removeFrom(ArtifactLocation al)
void CCombinedArtifactInstance::removeFrom(const ArtifactLocation & al)
{
CArtifactInstance::removeFrom(al);
for(auto & part : constituentsInfo)
@ -1110,7 +1107,7 @@ void CArtifactSet::putArtifact(ArtifactPosition slot, CArtifactInstance * art)
part.slot = ArtifactUtils::getArtAnyPosition(this, part.art->getTypeId());
assert(ArtifactUtils::isSlotEquipment(part.slot));
setNewArtSlot(part.slot, art, true);
setNewArtSlot(part.slot, part.art, true);
}
}
}

6
lib/CArtHandler.h
View File

@ -162,8 +162,8 @@ public:
/// of itself, additionally truth is returned for constituents of combined arts
virtual bool isPart(const CArtifactInstance *supposedPart) const;
virtual void putAt(ArtifactLocation al);
virtual void removeFrom(ArtifactLocation al);
virtual void putAt(const ArtifactLocation & al);
virtual void removeFrom(const ArtifactLocation & al);
virtual void move(const ArtifactLocation & src, const ArtifactLocation & dst);
template <typename Handler> void serialize(Handler &h, const int version)
@ -198,7 +198,7 @@ public:
bool isPart(const CArtifactInstance *supposedPart) const override;
void createConstituents();
void addAsConstituent(CArtifactInstance * art, const ArtifactPosition & slot);
void removeFrom(ArtifactLocation al) override;
void removeFrom(const ArtifactLocation & al) override;
CCombinedArtifactInstance() = default;

3
lib/CCreatureSet.cpp
View File

@ -882,9 +882,8 @@ void CStackInstance::removeArtifact(ArtifactPosition pos)
{
assert(getArt(pos));
detachFrom(*getArt(pos));
CArtifactSet::removeArtifact(pos);
if(ArtifactUtils::isSlotEquipment(pos))
detachFrom(*getArt(pos));
}
void CStackInstance::serializeJson(JsonSerializeFormat & handler)

27
lib/NetPacks.h
View File

@ -782,20 +782,6 @@ struct DLL_LINKAGE SetAvailableArtifacts : public CPackForClient
}
};
struct DLL_LINKAGE NewArtifact : public CPackForClient
{
void applyGs(CGameState * gs);
ConstTransitivePtr<CArtifactInstance> art;
virtual void visitTyped(ICPackVisitor & visitor) override;
template <typename Handler> void serialize(Handler & h, const int version)
{
h & art;
}
};
struct DLL_LINKAGE CGarrisonOperationPack : CPackForClient
{
};
@ -985,6 +971,19 @@ struct DLL_LINKAGE PutArtifact : CArtifactOperationPack
}
};
struct DLL_LINKAGE NewArtifact : public CArtifactOperationPack
{
ConstTransitivePtr<CArtifactInstance> art;
void applyGs(CGameState * gs);
virtual void visitTyped(ICPackVisitor & visitor) override;
template <typename Handler> void serialize(Handler & h, const int version)
{
h & art;
}
};
struct DLL_LINKAGE EraseArtifact : CArtifactOperationPack
{
ArtifactLocation al;

2
lib/NetPacksBase.h
View File

@ -192,7 +192,7 @@ struct ArtifactLocation
DLL_LINKAGE PlayerColor owningPlayer() const;
DLL_LINKAGE CArtifactSet *getHolderArtSet();
DLL_LINKAGE CBonusSystemNode *getHolderNode();
DLL_LINKAGE const CArtifactSet *getHolderArtSet() const;
DLL_LINKAGE CArtifactSet *getHolderArtSet() const;
DLL_LINKAGE const CBonusSystemNode *getHolderNode() const;
DLL_LINKAGE const CArtifactInstance *getArt() const;

2
lib/NetPacksLib.cpp
View File

@ -1618,7 +1618,7 @@ const CArtifactInstance *ArtifactLocation::getArt() const
return nullptr;
}
const CArtifactSet * ArtifactLocation::getHolderArtSet() const
CArtifactSet * ArtifactLocation::getHolderArtSet() const
{
auto * t = const_cast<ArtifactLocation *>(this);
return t->getHolderArtSet();