libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move initialisation from constructor to initialise().

Browse Source 
svn-id: r15823
This commit is contained in:
Joost Peters 2004-11-15 20:44:56 +00:00
parent a1867735a3
commit bd40d25a68
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sky/sky.cpp
View File

@ -115,18 +115,7 @@ void **SkyEngine::_itemList[300];
SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false };
SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
: Engine(syst) {
if (!_mixer->isReady())
warning("Sound initialisation failed.");
_mixer->setVolume(ConfMan.getInt("sfx_volume")); //unnecessary?
_floppyIntro = ConfMan.getBool("alt_intro");
_fastMode = 0;
_system->initSize(320, 200);
: Engine(syst), _fastmode(0) {
}
SkyEngine::~SkyEngine() {
@ -257,6 +246,14 @@ void SkyEngine::go() {
}
void SkyEngine::initialise(void) {
_system->initSize(320, 200);
if (!_mixer->isReady())
warning("Sound initialisation failed");
_mixer->setVolume(ConfMan.getInt("sfx_volume"));
_floppyIntro = ConfMan.getBool("alt_intro");
_skyDisk = new Disk(_gameDataPath);
_skySound = new Sound(_mixer, _skyDisk, ConfMan.getInt("sfx_volume"));