Skip to content

Y
ygopro-2pick
Commit 456c53fb authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'sound' into test

parents 5f1f2216 9dba54d0
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
gframe/config.h
View file @ 456c53fb
...@@ -50,7 +50,7 @@ inline int _wtoi(const wchar_t * s) { ...@@ -50,7 +50,7 @@ inline int _wtoi(const wchar_t * s) {
#include <irrlicht.h> #include <irrlicht.h>
#include <irrKlang.h> #include <irrKlang.h>
#ifdef IRRKLANG_STATIC #ifdef IRRKLANG_STATIC
#include "../ikpMP3/ikpMP3.h" #include "../ikpmp3/ikpMP3.h"
#endif #endif
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
......
gframe/game.cpp
View file @ 456c53fb
...@@ -694,6 +694,12 @@ bool Game::Initialize() { ...@@ -694,6 +694,12 @@ bool Game::Initialize() {
chkEnableMusic->setEnabled(false); chkEnableMusic->setEnabled(false);
chkMusicMode->setEnabled(false); chkMusicMode->setEnabled(false);
} }
#ifdef IRRKLANG_STATIC
else {
irrklang::ikpMP3Init(engineSound);
irrklang::ikpMP3Init(engineMusic);
}
#endif
hideChat = false; hideChat = false;
hideChatTimer = 0; hideChatTimer = 0;
return true; return true;
......
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