Commit 6e5cc16f authored by mercury233's avatar mercury233

fix

parent 4adcf746
......@@ -224,7 +224,7 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: YGOPro-${{ matrix.os }}
name: YGOPro-${{ matrix.os }}-${{ matrix.audiolib }}
path: |
bin/release/YGOPro.exe
......
......@@ -97,4 +97,5 @@ project "YGOPro"
links { "GL", "X11", "Xxf86vm" }
if USE_AUDIO and AUDIO_LIB == "irrklang" then
links { "IrrKlang" }
linkoptions{ IRRKLANG_LINK_RPATH }
end
......@@ -43,10 +43,9 @@ bool SoundManager::Init() {
#ifdef YGOPRO_USE_IRRKLANG
engineSound = irrklang::createIrrKlangDevice();
engineMusic = irrklang::createIrrKlangDevice();
if (!engineSound || !engineMusic) {
if(!engineSound || !engineMusic) {
return false;
}
else {
} else {
#ifdef IRRKLANG_STATIC
irrklang::ikpMP3Init(engineMusic);
#endif
......@@ -84,6 +83,7 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) {
});
}
void SoundManager::PlaySoundEffect(int sound) {
#ifdef YGOPRO_USE_AUDIO
if(!mainGame->chkEnableSound->isChecked())
return;
char soundName[32];
......@@ -221,6 +221,7 @@ void SoundManager::PlaySoundEffect(int sound) {
engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
engineSound->play2D(soundPath);
#endif
#endif // YGOPRO_USE_AUDIO
}
void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
if(element == mainGame->wMessage) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment