From 5ef6d928b9c007d7ee5efeded1f426d1c7892ab9 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Mon, 22 Dec 2008 00:32:01 +0000 Subject: [PATCH] Cleanup. svn-id: r35477 --- engines/agos/res.cpp | 12 +----------- engines/agos/res_snd.cpp | 16 +++------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index 7b989d91b47..b3dc1e7a56a 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 bbc9d2d4e07..5ac2f06a284 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 {