libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move most heavy initialization from engine constructor to mainInit()

Browse Source 
method which is called from go(). This ensures that extrapath is added
to list od default directories after all other paths.

svn-id: r15815
This commit is contained in:
Eugene Sandulenko 2004-11-15 03:57:22 +00:00
parent 4295a17c23
commit df4d3fe47a
2 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
scumm/scumm.cpp
View File

@ -896,54 +896,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_screenHeight = 200;
}
// Initialize backend
_system->initSize(_screenWidth, _screenHeight);
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
_system->openCD(cd_num);
// Create the sound manager
_sound = new Sound(this);
// Setup the music engine
setupMusic(gs.midi);
// TODO: We shouldn't rely on the global Language values matching those COMI etc. expect.
// Rather we should explicitly translate them.
_language = Common::parseLanguage(ConfMan.get("language"));
// Load localization data, if present
loadLanguageBundle();
// Load CJK font, if present
loadCJKFont();
// Create the charset renderer
if (_version <= 2)
_charset = new CharsetRendererV2(this, _language);
else if (_version == 3)
_charset = new CharsetRendererV3(this);
else if (_version == 8)
_charset = new CharsetRendererNut(this);
else
_charset = new CharsetRendererClassic(this);
// Create the costume renderer
if (_features & GF_NEW_COSTUMES)
_costumeRenderer = new AkosRenderer(this);
else
_costumeRenderer = new CostumeRenderer(this);
// Create FT INSANE object
if (_gameId == GID_FT)
_insane = new Insane((ScummEngine_v6 *)this);
else
_insane = 0;
// Load game from specified slot, if any
if (ConfMan.hasKey("save_slot")) {
requestLoad(ConfMan.getInt("save_slot"));
}
_midi = gs.midi;
}
ScummEngine::~ScummEngine() {
@ -1030,6 +983,56 @@ void ScummEngine::go() {
void ScummEngine::mainInit() {
// Initialize backend
_system->initSize(_screenWidth, _screenHeight);
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
_system->openCD(cd_num);
// Create the sound manager
_sound = new Sound(this);
// Setup the music engine
setupMusic(_midi);
// TODO: We shouldn't rely on the global Language values matching those COMI etc. expect.
// Rather we should explicitly translate them.
_language = Common::parseLanguage(ConfMan.get("language"));
// Load localization data, if present
loadLanguageBundle();
// Load CJK font, if present
loadCJKFont();
// Create the charset renderer
if (_version <= 2)
_charset = new CharsetRendererV2(this, _language);
else if (_version == 3)
_charset = new CharsetRendererV3(this);
else if (_version == 8)
_charset = new CharsetRendererNut(this);
else
_charset = new CharsetRendererClassic(this);
// Create the costume renderer
if (_features & GF_NEW_COSTUMES)
_costumeRenderer = new AkosRenderer(this);
else
_costumeRenderer = new CostumeRenderer(this);
// Create FT INSANE object
if (_gameId == GID_FT)
_insane = new Insane((ScummEngine_v6 *)this);
else
_insane = 0;
// Load game from specified slot, if any
if (ConfMan.hasKey("save_slot")) {
requestLoad(ConfMan.getInt("save_slot"));
}
#ifdef __PALM_OS__
if (_features & GF_NEW_COSTUMES)
_maxHeapThreshold = gVars->memory[kMemScummNewCostGames];

1
scumm/scumm.h
View File

@ -1089,6 +1089,7 @@ protected:
int _tempMusic;
int _saveSound;
bool _native_mt32;
int _midi;
int _midiDriver; // Use the MD_ values from mididrv.h
bool _copyProtection;
bool _demoMode;