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

Merge pull request #3588 from IvanSavenko/fix_regressions

Browse Source 
Fix regressions
This commit is contained in:
Ivan Savenko
2024-02-01 22:27:52 +02:00
committed by GitHub
parent 7247038458 b25d4d76a7
commit 58ee72f684
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/CMusicHandler.cpp
View File

@@ -188,7 +188,12 @@ uint32_t CSoundHandler::getSoundDurationMilliseconds(const AudioPath & sound)
if (!initialized || sound.empty()) if (!initialized || sound.empty())
return 0; return 0;
auto data = CResourceHandler::get()->load(sound.addPrefix("SOUNDS/"))->readAll(); auto resourcePath = sound.addPrefix("SOUNDS/");
if (!CResourceHandler::get()->existsResource(resourcePath))
return 0;
auto data = CResourceHandler::get()->load(resourcePath)->readAll();
SDL_AudioSpec spec; SDL_AudioSpec spec;
uint32_t audioLen; uint32_t audioLen;

5
lib/MetaString.cpp
View File

@@ -325,6 +325,11 @@ void MetaString::serializeJson(JsonSerializeFormat & handler)
jsonDeserialize(handler.getCurrent()); jsonDeserialize(handler.getCurrent());
} }
void MetaString::appendName(const ArtifactID & id)
{
appendTextID(id.toEntity(VLC)->getNameTextID());
}
void MetaString::appendName(const SpellID & id) void MetaString::appendName(const SpellID & id)
{ {
appendTextID(id.toEntity(VLC)->getNameTextID()); appendTextID(id.toEntity(VLC)->getNameTextID());

1
lib/MetaString.h
View File

@@ -75,6 +75,7 @@ public:
/// Appends specified number to resulting string /// Appends specified number to resulting string
void appendNumber(int64_t value); void appendNumber(int64_t value);
void appendName(const ArtifactID& id);
void appendName(const SpellID& id); void appendName(const SpellID& id);
void appendName(const PlayerColor& id); void appendName(const PlayerColor& id);
void appendName(const CreatureID & id, TQuantity count); void appendName(const CreatureID & id, TQuantity count);

2
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -1276,7 +1276,7 @@ EDiggingStatus CGHeroInstance::diggingStatus() const
{ {
if(static_cast<int>(movement) < movementPointsLimit(true)) if(static_cast<int>(movement) < movementPointsLimit(true))
return EDiggingStatus::LACK_OF_MOVEMENT; return EDiggingStatus::LACK_OF_MOVEMENT;
if(ArtifactID(ArtifactID::GRAIL).toArtifact()->canBePutAt(this)) if(!ArtifactID(ArtifactID::GRAIL).toArtifact()->canBePutAt(this))
return EDiggingStatus::BACKPACK_IS_FULL; return EDiggingStatus::BACKPACK_IS_FULL;
return cb->getTileDigStatus(visitablePos()); return cb->getTileDigStatus(visitablePos());
} }

4
server/CGameHandler.cpp
View File

@@ -3707,8 +3707,8 @@ bool CGameHandler::dig(const CGHeroInstance *h)
{ {
ArtifactID grail = ArtifactID::GRAIL; ArtifactID grail = ArtifactID::GRAIL;
iw.text.appendLocalString(EMetaText::GENERAL_TXT, 58); //"Congratulations! After spending many hours digging here, your hero has uncovered the " iw.text.appendLocalString(EMetaText::GENERAL_TXT, 58); //"Congratulations! After spending many hours digging here, your hero has uncovered the " ...
iw.text.replaceName(grail); iw.text.appendName(grail); // ... " The Grail"
iw.soundID = soundBase::ULTIMATEARTIFACT; iw.soundID = soundBase::ULTIMATEARTIFACT;
giveHeroNewArtifact(h, grail.toArtifact(), ArtifactPosition::FIRST_AVAILABLE); //give grail giveHeroNewArtifact(h, grail.toArtifact(), ArtifactPosition::FIRST_AVAILABLE); //give grail
sendAndApply(&iw); sendAndApply(&iw);