Merged the fs branch with trunk. r26949:27031

svn-id: r27032

1 files changed, 14 insertions, 4 deletions

diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp
index 630d85d145..05643a6e89 100644
--- a/engines/agos/zones.cpp
+++ b/engines/agos/zones.cpp
@@ -1,6 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -63,7 +65,15 @@ void AGOSEngine::loadZone(uint zoneNum) {
 	vpe->vgaFile1End = _blockEnd;
 
 	vpe->sfxFile = NULL;
-	if (!(getFeatures() & GF_ZLIBCOMP)) {
+
+	if ((getPlatform() == Common::kPlatformAmiga || getPlatform() == Common::kPlatformAtariST) &&
+		getGameType() == GType_ELVIRA2) {
+		// A singe sound file is used for Amiga and AtariST versions
+		if (loadVGASoundFile(1, 3)) {
+			vpe->sfxFile = _block;
+			vpe->sfxFileEnd = _blockEnd;
+		}
+	} else if (!(getFeatures() & GF_ZLIBCOMP)) {
 		if (loadVGASoundFile(zoneNum, 3)) {
 			vpe->sfxFile = _block;
 			vpe->sfxFileEnd = _blockEnd;