Skip to content

Y
ygopro-2pick
Commit d77c7126 authored by nanahira's avatar nanahira
Browse files
Options

mgirrchk

parent 1a3ad7f3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
gframe/game.cpp
View file @ d77c7126
...@@ -662,7 +662,7 @@ bool Game::Initialize() { ...@@ -662,7 +662,7 @@ bool Game::Initialize() {
col.setAlpha(224); col.setAlpha(224);
env->getSkin()->setColor((EGUI_DEFAULT_COLOR)i, col); env->getSkin()->setColor((EGUI_DEFAULT_COLOR)i, col);
} }
#ifndef __APPLE__ #ifdef YGOPRO_USE_IRRKLANG
engineSound = irrklang::createIrrKlangDevice(); engineSound = irrklang::createIrrKlangDevice();
engineMusic = irrklang::createIrrKlangDevice(); engineMusic = irrklang::createIrrKlangDevice();
#ifdef IRRKLANG_STATIC #ifdef IRRKLANG_STATIC
...@@ -1257,7 +1257,7 @@ void Game::SaveConfig() { ...@@ -1257,7 +1257,7 @@ void Game::SaveConfig() {
fclose(fp); fclose(fp);
} }
void Game::PlaySoundEffect(int sound) { void Game::PlaySoundEffect(int sound) {
#ifndef __APPLE__ #ifdef YGOPRO_USE_IRRKLANG
if(!mainGame->chkEnableSound->isChecked()) if(!mainGame->chkEnableSound->isChecked())
return; return;
switch(sound) { switch(sound) {
...@@ -1388,7 +1388,7 @@ void Game::PlaySoundEffect(int sound) { ...@@ -1388,7 +1388,7 @@ void Game::PlaySoundEffect(int sound) {
#endif #endif
} }
void Game::PlayMusic(char* song, bool loop) { void Game::PlayMusic(char* song, bool loop) {
#ifndef __APPLE__ #ifdef YGOPRO_USE_IRRKLANG
if(!mainGame->chkEnableMusic->isChecked()) if(!mainGame->chkEnableMusic->isChecked())
return; return;
if(!engineMusic->isCurrentlyPlaying(song)) { if(!engineMusic->isCurrentlyPlaying(song)) {
...@@ -1399,7 +1399,7 @@ void Game::PlayMusic(char* song, bool loop) { ...@@ -1399,7 +1399,7 @@ void Game::PlayMusic(char* song, bool loop) {
#endif #endif
} }
void Game::PlayBGM(int scene) { void Game::PlayBGM(int scene) {
#ifndef __APPLE__ #ifdef YGOPRO_USE_IRRKLANG
if(!mainGame->chkEnableMusic->isChecked()) if(!mainGame->chkEnableMusic->isChecked())
return; return;
if(!mainGame->chkMusicMode->isChecked()) if(!mainGame->chkMusicMode->isChecked())
......
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