aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
Diffstat (limited to 'engines/agos')
-rw-r--r--engines/agos/res.cpp12
-rw-r--r--engines/agos/res_snd.cpp16
2 files changed, 4 insertions, 24 deletions
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 7b989d91b4..b3dc1e7a56 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -725,18 +725,8 @@ void AGOSEngine::loadVGAVideoFile(uint16 id, uint8 type) {
} else if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
if (getPlatform() == Common::kPlatformAtariST)
sprintf(filename, "%.2d%d.out", id, type);
- else if (id == 20)
- sprintf(filename, "D%d.out", type);
- else if (id == 26)
- sprintf(filename, "J%d.out", type);
- else if (id == 27)
- sprintf(filename, "K%d.out", type);
- else if (id == 33)
- sprintf(filename, "Q%d.out", type);
- else if (id == 34)
- sprintf(filename, "R%d.out", type);
else
- sprintf(filename, "%.1d%d.out", id, type);
+ sprintf(filename, "%c%d.out", 48 + id, type);
} else if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2) {
sprintf(filename, "%.2d%d.pkd", id, type);
} else {
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index bbc9d2d4e0..5ac2f06a28 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -359,19 +359,9 @@ bool AGOSEngine::loadVGASoundFile(uint16 id, uint8 type) {
uint32 srcSize, dstSize;
if (getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) {
- if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
- if (id == 20)
- sprintf(filename, "D%d.out", type);
- else if (id == 26)
- sprintf(filename, "J%d.out", type);
- else if (id == 27)
- sprintf(filename, "K%d.out", type);
- else if (id == 33)
- sprintf(filename, "Q%d.out", type);
- else if (id == 34)
- sprintf(filename, "R%d.out", type);
- else
- sprintf(filename, "%.1d%d.out", id, type);
+ if (getGameType() == GType_ELVIRA1 && (getFeatures() & GF_DEMO) &&
+ getPlatform() == Common::kPlatformAmiga) {
+ sprintf(filename, "%c%d.out", 48 + id, type);
} else if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2) {
sprintf(filename, "%.2d%d.out", id, type);
} else {