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

Merge pull request #2757 from IvanSavenko/filesystem_refactor

Browse Source 
Filesystem refactor - part 1
This commit is contained in:
Ivan Savenko
2023-09-07 10:51:02 +03:00
committed by GitHub
parent 5f07f3f091 f30355839f
commit f39fbe5151
237 changed files with 1926 additions and 1761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CGObjectInstance.cpp
View File

@@ -214,7 +214,7 @@ std::string CGObjectInstance::getObjectName() const
return VLC->objtypeh->getObjectName(ID, subID);
}
std::optional<std::string> CGObjectInstance::getAmbientSound() const
std::optional<AudioPath> CGObjectInstance::getAmbientSound() const
{
const auto & sounds = VLC->objtypeh->getObjectSounds(ID, subID).ambient;
if(!sounds.empty())
@@ -223,7 +223,7 @@ std::optional<std::string> CGObjectInstance::getAmbientSound() const
return std::nullopt;
}
std::optional<std::string> CGObjectInstance::getVisitSound() const
std::optional<AudioPath> CGObjectInstance::getVisitSound() const
{
const auto & sounds = VLC->objtypeh->getObjectSounds(ID, subID).visit;
if(!sounds.empty())
@@ -232,7 +232,7 @@ std::optional<std::string> CGObjectInstance::getVisitSound() const
return std::nullopt;
}
std::optional<std::string> CGObjectInstance::getRemovalSound() const
std::optional<AudioPath> CGObjectInstance::getRemovalSound() const
{
const auto & sounds = VLC->objtypeh->getObjectSounds(ID, subID).removal;
if(!sounds.empty())