diff options
| author | Max Horn | 2006-04-08 08:23:33 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-08 08:23:33 +0000 |
| commit | 9c77c2ecd1beb3026df8249c5aed271616bc6449 (patch) | |
| tree | 6df21e591e09bc2660cf40c17dba062415b33443 /engines/scumm/scumm.h | |
| parent | 54b99891cb85b1e5112e9de9e44cc60149709829 (diff) | |
| download | scummvm-rg350-9c77c2ecd1beb3026df8249c5aed271616bc6449.tar.gz scummvm-rg350-9c77c2ecd1beb3026df8249c5aed271616bc6449.tar.bz2 scummvm-rg350-9c77c2ecd1beb3026df8249c5aed271616bc6449.zip | |
Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21684
Diffstat (limited to 'engines/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 88d9d6453e..ee4ef84bf6 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -428,7 +428,7 @@ public: ScummDebugger *_debugger; // Core variables - ScummGameSettings _game; + GameSettings _game; uint8 _gameMD5[16]; /** Random number generator */ @@ -445,7 +445,7 @@ protected: public: // Constructor / Destructor - ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); + ScummEngine(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst); virtual ~ScummEngine(); /** Startup function, main loop. */ |