[Scummvm-cvs-logs] SF.net SVN: scummvm:[47460] scummvm/trunk/engines/agos/sound.cpp

[Kirben at users.sourceforge.net]

Revision: 47460
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47460&view=rev
Author:   Kirben
Date:     2010-01-23 03:02:56 +0000 (Sat, 23 Jan 2010)

Log Message:
-----------
Fix regressions, only the Amiga CD32 version of Simon the Sorcerer 1 used signed sound data.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/sound.cpp

Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp	2010-01-23 00:35:14 UTC (rev 47459)
+++ scummvm/trunk/engines/agos/sound.cpp	2010-01-23 03:02:56 UTC (rev 47460)
@@ -482,7 +482,7 @@
 		}
 	}
 
-	const bool dataIsUnsigned = (_vm->getGameType() == GType_PP);
+	const bool dataIsUnsigned = true;
 
 	if (!_hasVoiceFile) {
 		sprintf(filename, "%s.voc", gss->speech_filename);
@@ -514,7 +514,7 @@
 		_hasEffectsFile = (_effects != 0);
 	}
 
-	const bool dataIsUnsigned = (_vm->getGameType() == GType_PP || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32);
+	const bool dataIsUnsigned = true;
 
 	if (!_hasEffectsFile) {
 		sprintf(filename, "%s.voc", gss->effects_filename);
@@ -534,7 +534,7 @@
 	}
 }
 
-// This method is only used by Simon1 Amiga Talkie & Windows
+// This method is only used by Simon1 Amiga CD32 & Windows
 void Sound::readSfxFile(const Common::String &filename) {
 	if (_hasEffectsFile)
 		return;
@@ -548,7 +548,7 @@
 		error("readSfxFile: Can't load sfx file %s", filename.c_str());
 	}
 
-	const bool dataIsUnsigned = (_vm->getGameType() == GType_PP || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32);
+	const bool dataIsUnsigned = (_vm->getGameId() != GID_SIMON1CD32);
 
 	delete _effects;
 	if (_vm->getGameId() == GID_SIMON1CD32) {
@@ -562,14 +562,14 @@
 	stopAll();
 
 	delete _effects;
-	const bool dataIsUnsigned = false;
+	const bool dataIsUnsigned = true;
 	if (_vm->getPlatform() == Common::kPlatformWindows)
 		_effects = new WavSound(_mixer, gameFile, base, DisposeAfterUse::NO);
 	else
-		_effects = new VocSound(_mixer, gameFile, dataIsUnsigned, base, DisposeAfterUse::NO);
+		_effects = new VocSound(_mixer, gameFile, dataIsUnsigned, base, false, DisposeAfterUse::NO);
 }
 
-// This method is only used by Simon1 Amiga Talkie
+// This method is only used by Simon1 Amiga CD32
 void Sound::readVoiceFile(const Common::String &filename) {
 	_mixer->stopHandle(_voiceHandle);
 
@@ -579,7 +579,7 @@
 	if (file->isOpen() == false)
 		error("readVoiceFile: Can't load voice file %s", filename.c_str());
 
-	const bool dataIsUnsigned = (_vm->getGameType() == GType_PP || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32);
+	const bool dataIsUnsigned = false;
 
 	delete _voice;
 	_voice = new RawSound(_mixer, file, dataIsUnsigned);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.