From 9c77c2ecd1beb3026df8249c5aed271616bc6449 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 8 Apr 2006 08:23:33 +0000 Subject: Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them) svn-id: r21684 --- engines/scumm/cursor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/cursor.cpp') 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++) { -- cgit v1.2.3