From bb0bbdef57265d3bbf729399f80cd00759cd82d1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 30 Oct 2007 22:20:02 +0000
Subject: The cause for bug #1804403 - "IHNM/ITE: Error loading Game resources
 (fs-node regression)" was fixed with commits #29327, #29328, #29329. Removed
 unneeded Amiga-specific code, which should finally fix this bug

svn-id: r29331
---
 engines/saga/rscfile.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'engines/saga')

diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp
index 95503592d5..a081b200a9 100644
--- a/engines/saga/rscfile.cpp
+++ b/engines/saga/rscfile.cpp
@@ -440,28 +440,16 @@ bool Resource::createContexts() {
 					sprintf(voicesFileName, "voicesd.cmp");
 					_vm->_gf_compressed_sounds = true;
 				}
-#ifndef __amigaos4__
 			} else if (Common::File::exists("inherit the earth voices") || 
 					   Common::File::exists("inherit the earth voices.cmp")) {
+				_contextsCount++;
+				voicesFileIndex = _contextsCount - 1;
 				if (Common::File::exists("inherit the earth voices")) {
 					sprintf(voicesFileName, "inherit the earth voices");
 				} else {
 					sprintf(voicesFileName, "inherit the earth voices.cmp");
 					_vm->_gf_compressed_sounds = true;
 				}
-#else
-			} else if (Common::File::exists("\"inherit the earth voices\"") || 
-					   Common::File::exists("\"inherit the earth voices.cmp\"")) {
-				if (Common::File::exists("\"inherit the earth voices\"")) {
-					sprintf(voicesFileName, "\"inherit the earth voices\"");
-				} else {
-					sprintf(voicesFileName, "\"inherit the earth voices.cmp\"");
-					_vm->_gf_compressed_sounds = true;
-				}
-#endif
-
-				_contextsCount++;
-				voicesFileIndex = _contextsCount - 1;
 
 				// The resources in the Wyrmkeep combined Windows/Mac/Linux CD version are little endian, but
 				// the voice file is big endian. If we got such a version with mixed files, mark this voice file
-- 
cgit v1.2.3