aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/cursor.cpp
diff options
context:
space:
mode:
authorMax Horn2006-04-08 08:23:33 +0000
committerMax Horn2006-04-08 08:23:33 +0000
commit9c77c2ecd1beb3026df8249c5aed271616bc6449 (patch)
tree6df21e591e09bc2660cf40c17dba062415b33443 /engines/scumm/cursor.cpp
parent54b99891cb85b1e5112e9de9e44cc60149709829 (diff)
downloadscummvm-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/cursor.cpp')
-rw-r--r--engines/scumm/cursor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index b9dd2302e3..1d64c42328 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -93,7 +93,7 @@ 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 ScummGameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
+ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst)
: ScummEngine(detector, syst, gs, md5sum, subst) {
for (int i = 0; i < 4; i++) {