From bfd7d71c5ebd8c1948be64411f0eb5bf7c383ffe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 24 Aug 2013 11:18:58 -0400
Subject: TSAGE: Fixed playing of scanner tones when switching between
 characters

---
 engines/tsage/ringworld2/ringworld2_dialogs.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 57fdef6405..e2afa574de 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -234,9 +234,9 @@ void CharacterDialog::show() {
 		SceneExt *scene = (SceneExt *)R2_GLOBALS._sceneManager._scene;
 		scene->saveCharacter(oldCharacter);
 
-		// Play a transition sound as the character is changed
+		// Play the correctfrequency, if any, of the character being switched to's scanner device 
 		if (R2_GLOBALS._player._characterScene[0] != 300) {
-			switch (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex]) {
+			switch (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex] - 1) {
 			case 0:
 				R2_GLOBALS._sound4.stop();
 				break;
@@ -256,7 +256,7 @@ void CharacterDialog::show() {
 				break;
 			}
 		} else if (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex] > 1) {
-			switch (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex]) {
+			switch (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex] - 1) {
 			case 2:
 				R2_GLOBALS._sound4.play(45);
 				break;
@@ -273,7 +273,7 @@ void CharacterDialog::show() {
 				break;
 			}
 		} else if ((R2_GLOBALS._player._characterScene[1] == 300) && (R2_GLOBALS._scannerFrequencies[1] != 1)) {
-			switch (R2_GLOBALS._scannerFrequencies[1]) {
+			switch (R2_GLOBALS._scannerFrequencies[1] - 1) {
 			case 2:
 				R2_GLOBALS._sound4.play(45);
 				break;
@@ -294,7 +294,7 @@ void CharacterDialog::show() {
 		} else if (R2_GLOBALS._scannerFrequencies[2] == 1) {
 			R2_GLOBALS._sound4.stop();
 		} else {
-			switch (R2_GLOBALS._scannerFrequencies[1]) {
+			switch (R2_GLOBALS._scannerFrequencies[1] - 1) {
 			case 2:
 				R2_GLOBALS._sound4.play(45);
 				break;
-- 
cgit v1.2.3