aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/cursor.cpp4
-rw-r--r--engines/scumm/debugger.cpp2
-rw-r--r--engines/scumm/he/intern_he.h16
-rw-r--r--engines/scumm/intern.h18
-rw-r--r--engines/scumm/plugin.cpp37
-rw-r--r--engines/scumm/scumm.cpp62
-rw-r--r--engines/scumm/scumm.h6
7 files changed, 70 insertions, 75 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 1d64c42328..6e86ad5644 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -93,8 +93,8 @@ static const byte default_v6_cursor[] = {
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
};
-ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine(detector, syst, gs, md5sum, subst) {
+ScummEngine_v5::ScummEngine_v5(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine(syst, gs, md5sum, subst) {
for (int i = 0; i < 4; i++) {
memcpy(_cursorImages[i], default_cursor_images[i], 32);
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 98359f084c..0f37947467 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -82,7 +82,7 @@ ScummDebugger::ScummDebugger(ScummEngine *s)
DVar_Register("scumm_roomresource", &_vm->_roomResource, DVAR_INT, 0);
DVar_Register("scumm_vars", &_vm->_scummVars, DVAR_INTARRAY, _vm->_numVariables);
- DVar_Register("scumm_gamename", &_vm->_targetName, DVAR_STRING, 0);
+// DVar_Register("scumm_gamename", &_vm->_targetName, DVAR_STRING, 0);
DVar_Register("scumm_exename", &_vm->_baseName, DVAR_STRING, 0);
DVar_Register("scumm_gameid", &_vm->_game.id, DVAR_BYTE, 0);
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index da349d004a..0fd51d5d8d 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -51,7 +51,7 @@ protected:
Common::File _hFileTable[17];
public:
- ScummEngine_v60he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v6(detector, syst, gs, md5sum, subst) {}
+ ScummEngine_v60he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v6(syst, gs, md5sum, subst) {}
virtual void scummInit();
@@ -116,7 +116,7 @@ protected:
bool _skipProcessActors;
public:
- ScummEngine_v70he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v70he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
~ScummEngine_v70he();
Wiz *_wiz;
@@ -182,7 +182,7 @@ protected:
class ScummEngine_v71he : public ScummEngine_v70he {
public:
- ScummEngine_v71he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v71he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
protected:
virtual void saveOrLoad(Serializer *s);
@@ -237,7 +237,7 @@ protected:
WizParameters _wizParams;
public:
- ScummEngine_v72he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v72he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
virtual void scummInit();
@@ -348,7 +348,7 @@ protected:
int32 _heSndResId, _curSndId, _sndPtrOffs, _sndTmrOffs;
public:
- ScummEngine_v80he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v80he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
protected:
virtual void setupOpcodes();
@@ -421,7 +421,7 @@ protected:
int32 _curSpriteGroupId;
public:
- ScummEngine_v90he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v90he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
~ScummEngine_v90he();
virtual void scummInit();
@@ -518,7 +518,7 @@ protected:
class ScummEngine_v99he : public ScummEngine_v90he {
public:
- ScummEngine_v99he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v90he(detector, syst, gs, md5sum, subst) {}
+ ScummEngine_v99he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v90he(syst, gs, md5sum, subst) {}
virtual void scummInit();
@@ -549,7 +549,7 @@ protected:
const OpcodeEntryV100he *_opcodesV100he;
public:
- ScummEngine_v100he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v99he(detector, syst, gs, md5sum, subst) {}
+ ScummEngine_v100he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst) : ScummEngine_v99he(syst, gs, md5sum, subst) {}
protected:
virtual void setupOpcodes();
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index d31dbf298d..530f3a36ed 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -50,7 +50,7 @@ protected:
byte _cursorHotspots[2 * 4];
public:
- ScummEngine_v5(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v5(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
protected:
virtual void setupOpcodes();
@@ -193,7 +193,7 @@ protected:
*/
class ScummEngine_v4 : public ScummEngine_v5 {
public:
- ScummEngine_v4(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v4(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
virtual void scummInit();
@@ -212,7 +212,7 @@ protected:
*/
class ScummEngine_v3 : public ScummEngine_v4 {
public:
- ScummEngine_v3(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v3(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
protected:
virtual void readRoomsOffsets();
@@ -224,7 +224,7 @@ protected:
*/
class ScummEngine_v3old : public ScummEngine_v3 {
public:
- ScummEngine_v3old(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v3old(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
protected:
virtual void readResTypeList(int id, const char *name);
@@ -257,7 +257,7 @@ protected:
int8 _mouseOverBoxV2;
public:
- ScummEngine_v2(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v2(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
virtual void scummInit();
@@ -403,7 +403,7 @@ protected:
int _currentMode;
public:
- ScummEngine_c64(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_c64(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
virtual void scummInit();
@@ -555,7 +555,7 @@ protected:
public:
- ScummEngine_v6(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v6(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
virtual void scummInit();
@@ -784,7 +784,7 @@ protected:
#ifndef DISABLE_SCUMM_7_8
class ScummEngine_v7 : public ScummEngine_v6 {
public:
- ScummEngine_v7(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v7(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
~ScummEngine_v7();
struct LangIndexNode {
@@ -865,7 +865,7 @@ protected:
ObjectNameId *_objectIDMap;
public:
- ScummEngine_v8(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine_v8(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
~ScummEngine_v8();
protected:
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index ac9bcfc0bd..f1087040b7 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -25,7 +25,6 @@
#include "backends/fs/fs.h"
-#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/config-manager.h"
@@ -1618,7 +1617,7 @@ DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) {
*
* This is heavily based on our MD5 detection scheme.
*/
-Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
+Engine *Engine_SCUMM_create(OSystem *syst) {
Engine *engine;
const char *gameid = ConfMan.get("gameid").c_str();
@@ -1811,65 +1810,65 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
case 1:
case 2:
if (game.id == GID_MANIAC && game.platform == Common::kPlatformC64)
- engine = new ScummEngine_c64(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_c64(syst, game, md5sum, subst);
else
- engine = new ScummEngine_v2(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v2(syst, game, md5sum, subst);
break;
case 3:
if (game.features & GF_OLD_BUNDLE)
- engine = new ScummEngine_v3old(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v3old(syst, game, md5sum, subst);
else
- engine = new ScummEngine_v3(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v3(syst, game, md5sum, subst);
break;
case 4:
- engine = new ScummEngine_v4(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v4(syst, game, md5sum, subst);
break;
case 5:
- engine = new ScummEngine_v5(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v5(syst, game, md5sum, subst);
break;
case 6:
switch (game.heversion) {
#ifndef DISABLE_HE
case 100:
- engine = new ScummEngine_v100he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v100he(syst, game, md5sum, subst);
break;
case 99:
- engine = new ScummEngine_v99he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v99he(syst, game, md5sum, subst);
break;
case 98:
case 95:
case 90:
- engine = new ScummEngine_v90he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v90he(syst, game, md5sum, subst);
break;
case 80:
- engine = new ScummEngine_v80he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v80he(syst, game, md5sum, subst);
break;
case 73:
case 72:
- engine = new ScummEngine_v72he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v72he(syst, game, md5sum, subst);
break;
case 71:
- engine = new ScummEngine_v71he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v71he(syst, game, md5sum, subst);
break;
case 70:
- engine = new ScummEngine_v70he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v70he(syst, game, md5sum, subst);
break;
#endif
#ifndef PALMOS_68K
case 61:
- engine = new ScummEngine_v60he(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v60he(syst, game, md5sum, subst);
break;
#endif
default:
- engine = new ScummEngine_v6(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v6(syst, game, md5sum, subst);
}
break;
#ifndef DISABLE_SCUMM_7_8
case 7:
- engine = new ScummEngine_v7(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v7(syst, game, md5sum, subst);
break;
case 8:
- engine = new ScummEngine_v8(detector, syst, game, md5sum, subst);
+ engine = new ScummEngine_v8(syst, game, md5sum, subst);
break;
#endif
default:
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ed846fa7b9..949c35f0d1 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -25,7 +25,6 @@
#include "backends/fs/fs.h"
-#include "base/gameDetector.h"
#include "base/plugins.h"
#include "common/config-manager.h"
@@ -81,7 +80,7 @@ namespace Scumm {
ScummEngine *g_scumm = 0;
-ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ScummEngine::ScummEngine(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
: Engine(syst),
_game(gs),
_substResFileName(subst),
@@ -89,8 +88,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const GameSettin
_currentScript(0xFF), // Let debug() work on init stage
gdi(this),
res(this),
- _pauseDialog(0), _mainMenuDialog(0), _versionDialog(0),
- _targetName(detector->_targetName) {
+ _pauseDialog(0), _mainMenuDialog(0), _versionDialog(0) {
// Copy MD5 checksum
memcpy(_gameMD5, md5sum, 16);
@@ -677,22 +675,22 @@ ScummEngine::~ScummEngine() {
delete _debugger;
}
-ScummEngine_v4::ScummEngine_v4(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v5(detector, syst, gs, md5sum, subst) {
+ScummEngine_v4::ScummEngine_v4(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v5(syst, gs, md5sum, subst) {
_resourceHeaderSize = 6;
}
-ScummEngine_v3::ScummEngine_v3(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v4(detector, syst, gs, md5sum, subst) {
+ScummEngine_v3::ScummEngine_v3(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v4(syst, gs, md5sum, subst) {
}
-ScummEngine_v3old::ScummEngine_v3old(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v3(detector, syst, gs, md5sum, subst) {
+ScummEngine_v3old::ScummEngine_v3old(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v3(syst, gs, md5sum, subst) {
_resourceHeaderSize = 4;
}
-ScummEngine_v2::ScummEngine_v2(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v3old(detector, syst, gs, md5sum, subst) {
+ScummEngine_v2::ScummEngine_v2(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v3old(syst, gs, md5sum, subst) {
VAR_SENTENCE_VERB = 0xFF;
VAR_SENTENCE_OBJECT1 = 0xFF;
@@ -705,14 +703,14 @@ ScummEngine_v2::ScummEngine_v2(GameDetector *detector, OSystem *syst, const Game
VAR_CLICK_OBJECT = 0xFF;
}
-ScummEngine_c64::ScummEngine_c64(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v2(detector, syst, gs, md5sum, subst) {
+ScummEngine_c64::ScummEngine_c64(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v2(syst, gs, md5sum, subst) {
_currentMode = 0;
}
-ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine(detector, syst, gs, md5sum, subst) {
+ScummEngine_v6::ScummEngine_v6(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine(syst, gs, md5sum, subst) {
_blastObjectQueuePos = 0;
memset(_blastObjectQueue, 0, sizeof(_blastObjectQueue));
_blastTextQueuePos = 0;
@@ -733,8 +731,8 @@ ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const Game
}
#ifndef DISABLE_HE
-ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v60he(detector, syst, gs, md5sum, subst) {
+ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v60he(syst, gs, md5sum, subst) {
if (_game.platform == Common::kPlatformMacintosh && (_game.heversion >= 72 && _game.heversion <= 73))
_resExtractor = new MacResExtractor(this);
else
@@ -765,16 +763,16 @@ ScummEngine_v70he::~ScummEngine_v70he() {
free(_storedFlObjects);
}
-ScummEngine_v71he::ScummEngine_v71he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v70he(detector, syst, gs, md5sum, subst) {
+ScummEngine_v71he::ScummEngine_v71he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v70he(syst, gs, md5sum, subst) {
_auxBlocksNum = 0;
memset(_auxBlocks, 0, sizeof(_auxBlocks));
_auxEntriesNum = 0;
memset(_auxEntries, 0, sizeof(_auxEntries));
}
-ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v71he(detector, syst, gs, md5sum, subst) {
+ScummEngine_v72he::ScummEngine_v72he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v71he(syst, gs, md5sum, subst) {
VAR_NUM_ROOMS = 0xFF;
VAR_NUM_SCRIPTS = 0xFF;
VAR_NUM_SOUNDS = 0xFF;
@@ -784,8 +782,8 @@ ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, cons
VAR_POLYGONS_ONLY = 0xFF;
}
-ScummEngine_v80he::ScummEngine_v80he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v72he(detector, syst, gs, md5sum, subst) {
+ScummEngine_v80he::ScummEngine_v80he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v72he(syst, gs, md5sum, subst) {
_heSndResId = 0;
_curSndId = 0;
_sndPtrOffs = 0;
@@ -797,8 +795,8 @@ ScummEngine_v80he::ScummEngine_v80he(GameDetector *detector, OSystem *syst, cons
VAR_COLOR_DEPTH = 0xFF;
}
-ScummEngine_v90he::ScummEngine_v90he(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v80he(detector, syst, gs, md5sum, subst) {
+ScummEngine_v90he::ScummEngine_v90he(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v80he(syst, gs, md5sum, subst) {
_sprite = new Sprite(this);
VAR_NUM_SPRITE_GROUPS = 0xFF;
@@ -822,8 +820,8 @@ ScummEngine_v90he::~ScummEngine_v90he() {
#endif
#ifndef DISABLE_SCUMM_7_8
-ScummEngine_v7::ScummEngine_v7(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v6(detector, syst, gs, md5sum, subst) {
+ScummEngine_v7::ScummEngine_v7(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v6(syst, gs, md5sum, subst) {
_verbCharset = 0;
_existLanguageFile = false;
_languageBuffer = NULL;
@@ -836,8 +834,8 @@ ScummEngine_v7::~ScummEngine_v7() {
free(_languageIndex);
}
-ScummEngine_v8::ScummEngine_v8(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
- : ScummEngine_v7(detector, syst, gs, md5sum, subst) {
+ScummEngine_v8::ScummEngine_v8(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ : ScummEngine_v7(syst, gs, md5sum, subst) {
_objectIDMap = 0;
}
@@ -850,7 +848,7 @@ ScummEngine_v8::~ScummEngine_v8() {
#pragma mark --- Initialization ---
#pragma mark -
-int ScummEngine::init(GameDetector &detector) {
+int ScummEngine::init() {
// Initialize backend
_system->beginGFXTransaction();
@@ -867,7 +865,7 @@ int ScummEngine::init(GameDetector &detector) {
_system->initSize(_screenWidth, _screenHeight, (ConfMan.getBool("force_1x_overlay") ? 1 : 2));
defaultTo1XScaler = (_screenWidth > 320);
}
- initCommonGFX(detector, defaultTo1XScaler);
+ initCommonGFX(defaultTo1XScaler);
_system->endGFXTransaction();
// On some systems it's not safe to run CD audio games from the CD.
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index ee4ef84bf6..489e897afb 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -41,7 +41,6 @@ namespace GUI {
class Dialog;
}
using GUI::Dialog;
-class GameDetector;
namespace Common {
class InSaveFile;
class OutSaveFile;
@@ -445,14 +444,14 @@ protected:
public:
// Constructor / Destructor
- ScummEngine(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+ ScummEngine(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
virtual ~ScummEngine();
/** Startup function, main loop. */
int go();
// Init functions
- int init(GameDetector &detector);
+ int init();
virtual void setupScummVars();
virtual void initScummVars();
@@ -739,7 +738,6 @@ public:
protected:
int _resourceHeaderSize;
Common::String _baseName; // This is the name we use for opening resource files
- Common::String _targetName; // This is the game the user calls it, so use for saving
byte _resourceMapper[128];
byte *_heV7DiskOffsets;
uint32 *_heV7RoomIntOffsets;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 00:17:43 +0000