aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-04-14 00:10:12 +0000
committerTravis Howell2006-04-14 00:10:12 +0000
commit94774a148dca2e752e374f35adf05cb9753efdef (patch)
treed7dfbb38df1dcda0dcc061d5a6bb64c106a3c48f
parent7cc83b82f2f69f5d52868a5b8548a2f9d8055d0c (diff)
downloadscummvm-rg350-94774a148dca2e752e374f35adf05cb9753efdef.tar.gz
scummvm-rg350-94774a148dca2e752e374f35adf05cb9753efdef.tar.bz2
scummvm-rg350-94774a148dca2e752e374f35adf05cb9753efdef.zip
Fix regression in Amiga version of FF
svn-id: r21857
-rw-r--r--engines/simon/game.cpp16
-rw-r--r--engines/simon/intern.h3
2 files changed, 10 insertions, 9 deletions
diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp
index fb0d04372a..b8b4cb8788 100644
--- a/engines/simon/game.cpp
+++ b/engines/simon/game.cpp
@@ -486,13 +486,13 @@ static GameFileDescription SIMON2WIN_PL_GameFiles[] = {
static GameFileDescription FEEBLEFILES_AMI_DE_GameFiles[] = {
{ "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e"},
- { "graphics.vga", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
+ { "gfxindex.dat", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
};
static GameFileDescription FEEBLEFILES_AMI_UK_GameFiles[] = {
{ "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7"},
- { "graphics.vga", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
+ { "gfxindex.dat", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
};
@@ -1131,7 +1131,7 @@ static GameDescription gameDescriptions[] = {
"CD",
ARRAYSIZE(FEEBLEFILES_AMI_UK_GameFiles),
FEEBLEFILES_AMI_UK_GameFiles,
- GF_OLD_BUNDLE | GF_TALKIE,
+ GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
Common::EN_ANY,
Common::kPlatformAmiga,
},
@@ -1144,7 +1144,7 @@ static GameDescription gameDescriptions[] = {
"CD",
ARRAYSIZE(FEEBLEFILES_AMI_DE_GameFiles),
FEEBLEFILES_AMI_DE_GameFiles,
- GF_OLD_BUNDLE | GF_TALKIE,
+ GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
Common::DE_DEU,
Common::kPlatformAmiga,
},
@@ -1157,7 +1157,7 @@ static GameDescription gameDescriptions[] = {
"CD",
ARRAYSIZE(FEEBLEFILES_MAC_UK_GameFiles),
FEEBLEFILES_MAC_UK_GameFiles,
- GF_OLD_BUNDLE | GF_TALKIE,
+ GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
Common::EN_ANY,
Common::kPlatformMacintosh,
},
@@ -1170,7 +1170,7 @@ static GameDescription gameDescriptions[] = {
"CD",
ARRAYSIZE(FEEBLEFILES_MAC_FR_GameFiles),
FEEBLEFILES_MAC_FR_GameFiles,
- GF_OLD_BUNDLE | GF_TALKIE,
+ GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
Common::FR_FRA,
Common::kPlatformMacintosh,
},
@@ -1183,7 +1183,7 @@ static GameDescription gameDescriptions[] = {
"CD",
ARRAYSIZE(FEEBLEFILES_MAC_DE_GameFiles),
FEEBLEFILES_MAC_DE_GameFiles,
- GF_OLD_BUNDLE | GF_TALKIE,
+ GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
Common::DE_DEU,
Common::kPlatformMacintosh,
},
@@ -1196,7 +1196,7 @@ static GameDescription gameDescriptions[] = {
"CD",
ARRAYSIZE(FEEBLEFILES_MAC_SP_GameFiles),
FEEBLEFILES_MAC_SP_GameFiles,
- GF_OLD_BUNDLE | GF_TALKIE,
+ GF_OLD_BUNDLE | GF_ZLIBCOMP | GF_TALKIE,
Common::ES_ESP,
Common::kPlatformMacintosh,
},
diff --git a/engines/simon/intern.h b/engines/simon/intern.h
index 1c9721b297..b0c036b056 100644
--- a/engines/simon/intern.h
+++ b/engines/simon/intern.h
@@ -176,7 +176,8 @@ struct GameSpecificSettings {
enum GameFeatures {
GF_TALKIE = 1 << 0,
GF_OLD_BUNDLE = 1 << 1,
- GF_CRUNCHED = 1 << 2
+ GF_CRUNCHED = 1 << 2,
+ GF_ZLIBCOMP = 1 << 3
};
enum GameFileTypes {