thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some more target<->game cleanup

Browse source 
svn-id: r10769
This commit is contained in:
Max Horn 2003-10-12 19:10:17 +00:00
parent 5325ed83cf
commit 31ba12c800
12 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scumm/scummvm.cpp
View file

@ -364,8 +364,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst)
_keyScriptKey = 0;
_keyScriptNo = 0;
_fileOffset = 0;
_exe_name = NULL;
_game_name = NULL;
_dynamicRoomOffsets = false;
memset(_resourceMapper, 0, sizeof(_resourceMapper));
_allocatedSize = 0;
@ -595,8 +593,13 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst)
_debugLevel = ConfMan.getInt("debuglevel");
_dumpScripts = detector->_dumpScripts;
_bootParam = ConfMan.getInt("boot_param");
_exe_name = strdup(detector->_game.gameName);
_game_name = strdup(detector->_targetName.c_str());
// Allow the user to override the game name with a custom string.
// This allows some game versions to work which use filenames
// differing from the regular version(s) of that game.
_gameName = ConfMan.hasKey("basename") ? ConfMan.get("basename") : detector->_game.gameName;
_targetName = detector->_targetName;
_gameId = detector->_game.id;
_version = detector->_game.version;
setFeatures(detector->_game.features);
@ -786,8 +789,6 @@ ScummEngine::~ScummEngine() {
free(_bitVars);
free(_newNames);
free(_classData);
free(_exe_name);
free(_game_name);
free(_roomStrips);
free(_languageIndex);