[Scummvm-git-logs] scummvm master -> 5e3ad4b236619d8b2892a5c6b3434d96a7976812

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6044ba16ce TITANIC: Added sound command to debugger
5e3ad4b236 TITANIC: Fix ship announcements with no content


Commit: 6044ba16ceac190886c04412d07da341ac2757b9
    https://github.com/scummvm/scummvm/commit/6044ba16ceac190886c04412d07da341ac2757b9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-06T11:07:55-04:00

Commit Message:
TITANIC: Added sound command to debugger

Changed paths:
    engines/titanic/debugger.cpp
    engines/titanic/debugger.h


diff --git a/engines/titanic/debugger.cpp b/engines/titanic/debugger.cpp
index e0c0207..bd42c95 100644
--- a/engines/titanic/debugger.cpp
+++ b/engines/titanic/debugger.cpp
@@ -36,6 +36,7 @@ Debugger::Debugger(TitanicEngine *vm) : GUI::Debugger(), _vm(vm) {
 	registerCmd("pet",			WRAP_METHOD(Debugger, cmdPET));
 	registerCmd("item",			WRAP_METHOD(Debugger, cmdItem));
 	registerCmd("movie",		WRAP_METHOD(Debugger, cmdMovie));
+	registerCmd("sound",		WRAP_METHOD(Debugger, cmdSound));
 }
 
 int Debugger::strToInt(const char *s) {
@@ -294,4 +295,23 @@ bool Debugger::cmdMovie(int argc, const char **argv) {
 	return false;
 }
 
+bool Debugger::cmdSound(int argc, const char **argv) {
+	if (argc == 2) {
+		Common::String name = argv[1];
+		const char *ch = strchr(argv[1], '!');
+		if (ch)
+			name.setChar('#', ch - argv[1]);
+		if (!name.contains("#"))
+			name = "z#" + name;
+
+		CGameManager *gameManager = g_vm->_window->_gameManager;
+		CProximity prox;
+		gameManager->_sound.playSound(name, prox);
+		return false;
+	} else {
+		debugPrintf("sound <name>\n");
+		return true;
+	}
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/debugger.h b/engines/titanic/debugger.h
index 919d6c5..a9610d1 100644
--- a/engines/titanic/debugger.h
+++ b/engines/titanic/debugger.h
@@ -94,6 +94,11 @@ private:
 	 * Shows a movie
 	 */
 	bool cmdMovie(int argc, const char **argv);
+
+	/**
+	 * Play a sound
+	 */
+	bool cmdSound(int argc, const char **argv);
 protected:
 	TitanicEngine *_vm;
 public:


Commit: 5e3ad4b236619d8b2892a5c6b3434d96a7976812
    https://github.com/scummvm/scummvm/commit/5e3ad4b236619d8b2892a5c6b3434d96a7976812
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-06T11:34:20-04:00

Commit Message:
TITANIC: Fix ship announcements with no content

Changed paths:
    engines/titanic/game/announce.cpp


diff --git a/engines/titanic/game/announce.cpp b/engines/titanic/game/announce.cpp
index 762311b..6e43b9c 100644
--- a/engines/titanic/game/announce.cpp
+++ b/engines/titanic/game/announce.cpp
@@ -59,20 +59,19 @@ bool CAnnounce::TimerMsg(CTimerMsg *msg) {
 
 	if (msg->_actionVal == 1) {
 		CString numStr = "0";
-		CString waveNames1[20] = {
+		CString waveNames1[18] = {
 			"z#181.wav", "z#211.wav", "z#203.wav", "z#202.wav", "z#201.wav",
 			"z#200.wav", "z#199.wav", "z#198.wav", "z#197.wav", "z#196.wav",
 			"z#210.wav", "z#209.wav", "z#208.wav", "z#207.wav", "z#206.wav",
-			"z#205.wav", "z#204.wav", "z#145.wav", "", ""
+			"z#205.wav", "z#204.wav", "z#145.wav"
 		};
-		CString waveNames2[37] = {
+		CString waveNames2[30] = {
 			"z#154.wav", "z#153.wav", "z#152.wav", "z#151.wav", "z#150.wav",
 			"z#149.wav", "z#148.wav", "z#169.wav", "z#171.wav", "z#178.wav",
 			"z#176.wav", "z#177.wav", "z#165.wav", "z#170.wav", "z#180.wav",
 			"z#156.wav", "z#172.wav", "z#173.wav", "z#160.wav", "z#158.wav",
 			"z#161.wav", "z#179.wav", "z#163.wav", "z#164.wav", "z#162.wav",
-			"z#159.wav", "z#175.wav", "z#166.wav", "z#174.wav", "z#157.wav",
-			"", "", "", "", "", "", ""
+			"z#159.wav", "z#175.wav", "z#166.wav", "z#174.wav", "z#157.wav"
 		};
 
 		CProximity prox;
@@ -83,19 +82,19 @@ bool CAnnounce::TimerMsg(CTimerMsg *msg) {
 		case 0:
 		case 1:
 			_soundHandle = playSound("z#189.wav", prox);
-			if (_nameIndex < 20) {
+			if (_nameIndex < 18) {
 				queueSound(waveNames1[_nameIndex], _soundHandle, 100, 0, false,
 					Audio::Mixer::kSpeechSoundType);
 				++_nameIndex;
 			} else {
-				queueSound(waveNames1[1 + getRandomNumber(17)], _soundHandle,
+				queueSound(waveNames1[getRandomNumber(17)], _soundHandle,
 					100, 0, false, Audio::Mixer::kSpeechSoundType);
 			}
 			break;
 
 		case 2:
 			_soundHandle = playSound("z#189.wav", prox);
-			queueSound(waveNames2[1 + getRandomNumber(35)], _soundHandle,
+			queueSound(waveNames2[getRandomNumber(29)], _soundHandle,
 				100, 0, false, Audio::Mixer::kSpeechSoundType);
 			break;