diff options
| author | Max Horn | 2003-11-10 01:04:12 +0000 |
|---|---|---|
| committer | Max Horn | 2003-11-10 01:04:12 +0000 |
| commit | e34f2b8b3321a576c2ae612470d07cb3e7bc91f5 (patch) | |
| tree | 350146bd56be39f91232ed50f7fa2d3330011ab3 /sword2 | |
| parent | 63c6944492ad4bfa0ffbc811e4d1bad9f8452008 (diff) | |
| download | scummvm-rg350-e34f2b8b3321a576c2ae612470d07cb3e7bc91f5.tar.gz scummvm-rg350-e34f2b8b3321a576c2ae612470d07cb3e7bc91f5.tar.bz2 scummvm-rg350-e34f2b8b3321a576c2ae612470d07cb3e7bc91f5.zip | |
cut down on unnecessary GameDetector references
svn-id: r11239
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/sword2.cpp | 5 | ||||
| -rw-r--r-- | sword2/sword2.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index a5d1a56e5e..a63ceb3169 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -54,7 +54,7 @@ static const GameSettings sword2_settings[] = { /* Broken Sword 2 */ {"sword2", "Broken Sword II", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" }, {"sword2alt", "Broken Sword II (alt)", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" }, - {"sword2demo", "Broken Sword II (Demo)", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER | GF_DEMO, "players.clu" }, + {"sword2demo", "Broken Sword II (Demo)", MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER | Sword2::GF_DEMO, "players.clu" }, {NULL, NULL, MDT_NONE, 0, NULL} }; @@ -102,9 +102,8 @@ Sound *g_sound = NULL; Display *g_display = NULL; Sword2Engine::Sword2Engine(GameDetector *detector, OSystem *syst) - : Engine(detector, syst) { + : Engine(syst) { - _detector = detector; g_sword2 = this; _debugger = NULL; _features = detector->_game.features; diff --git a/sword2/sword2.h b/sword2/sword2.h index b8d2094cd9..624c69c289 100644 --- a/sword2/sword2.h +++ b/sword2/sword2.h @@ -37,12 +37,14 @@ #include "sword2/driver/d_sound.h" #include "sword2/driver/d_draw.h" +class GameDetector; + +namespace Sword2 { + enum { GF_DEMO = 1 << 0 }; -namespace Sword2 { - // Bodge for PCF76 version so that their demo CD can be labelled "PCF76" // rather than "RBSII1" @@ -141,7 +143,6 @@ public: void go(void); void parseEvents(void); int32 InitialiseGame(void); - GameDetector *_detector; uint32 _features; char *_targetName; // target name for saves |