d new way to manage the sound fade for game start/stop via optional ini: GameStartStopFadeSoundMilliseconds=3500
This commit is contained in:
parent
5ac681ca73
commit
5ee20018d8
|
@ -46,7 +46,7 @@ const float PHOTO_MODE_MAXHEIGHT = 500.0;
|
||||||
const int CREATE_NEW_TEAM = -100;
|
const int CREATE_NEW_TEAM = -100;
|
||||||
const int CANCEL_SWITCH_TEAM = -1;
|
const int CANCEL_SWITCH_TEAM = -1;
|
||||||
|
|
||||||
const int fadeMusicMilliseconds = 3500;
|
int fadeMusicMilliseconds = 3500;
|
||||||
|
|
||||||
Game::Game() : ProgramState(NULL) {
|
Game::Game() : ProgramState(NULL) {
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
@ -106,6 +106,8 @@ Game::Game() : ProgramState(NULL) {
|
||||||
currentUIState=NULL;
|
currentUIState=NULL;
|
||||||
currentAmbientSound=NULL;
|
currentAmbientSound=NULL;
|
||||||
//printf("In [%s:%s] Line: %d currentAmbientSound = [%p]\n",__FILE__,__FUNCTION__,__LINE__,currentAmbientSound);
|
//printf("In [%s:%s] Line: %d currentAmbientSound = [%p]\n",__FILE__,__FUNCTION__,__LINE__,currentAmbientSound);
|
||||||
|
|
||||||
|
fadeMusicMilliseconds = Config::getInstance().getInt("GameStartStopFadeSoundMilliseconds",intToStr(fadeMusicMilliseconds).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void Game::resetMembers() {
|
void Game::resetMembers() {
|
||||||
|
@ -174,6 +176,8 @@ void Game::resetMembers() {
|
||||||
currentAmbientSound=NULL;
|
currentAmbientSound=NULL;
|
||||||
//printf("In [%s:%s] Line: %d currentAmbientSound = [%p]\n",__FILE__,__FUNCTION__,__LINE__,currentAmbientSound);
|
//printf("In [%s:%s] Line: %d currentAmbientSound = [%p]\n",__FILE__,__FUNCTION__,__LINE__,currentAmbientSound);
|
||||||
|
|
||||||
|
fadeMusicMilliseconds = Config::getInstance().getInt("GameStartStopFadeSoundMilliseconds",intToStr(fadeMusicMilliseconds).c_str());
|
||||||
|
|
||||||
Object::setStateCallback(&gui);
|
Object::setStateCallback(&gui);
|
||||||
|
|
||||||
Logger &logger= Logger::getInstance();
|
Logger &logger= Logger::getInstance();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user