[Scummvm-git-logs] scummvm master -> 79414a457e7b8ccd752960f81eb53cc7914dbf4c

[mduggan]

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

Summary:
79414a457e ULTIMA8: Fix some bugs in surrender process


Commit: 79414a457e7b8ccd752960f81eb53cc7914dbf4c
    https://github.com/scummvm/scummvm/commit/79414a457e7b8ccd752960f81eb53cc7914dbf4c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-06-26T15:57:58+09:00

Commit Message:
ULTIMA8: Fix some bugs in surrender process

Changed paths:
    engines/ultima/ultima8/world/actors/surrender_process.cpp


diff --git a/engines/ultima/ultima8/world/actors/surrender_process.cpp b/engines/ultima/ultima8/world/actors/surrender_process.cpp
index 329b4dfbaa..d23f8f90f7 100644
--- a/engines/ultima/ultima8/world/actors/surrender_process.cpp
+++ b/engines/ultima/ultima8/world/actors/surrender_process.cpp
@@ -102,19 +102,26 @@ void SurrenderProcess::run() {
 	switch (a->getShape()) {
 	case 0x2f7: // suit
 		soundno = SUIT_SUR_SNDS[getRandom() % NUM_SUIT_SUR_SNDS];
+		break;
 	case 0x2f5: // hardhat
 		soundno = HARDHAT_SUR_SNDS[getRandom() % NUM_HARDHAT_SUR_SNDS];
+		break;
 	case 0x2f6: // chemsuit
 		soundno = CHEMSUIT_SUR_SNDS[getRandom() % NUM_CHEMSUIT_SUR_SNDS];
+		break;
 	case 0x344: // chemsuit
 		soundno = SCIENTIST_SUR_SNDS[getRandom() % NUM_SCIENTIST_SUR_SNDS];
+		break;
 	case 0x597: // female office worker
 		soundno = FEMALE_SUR_SNDS[getRandom() % NUM_FEMALE_SUR_SNDS];
+		break;
 	}
 
 	AudioProcess *audio = AudioProcess::get_instance();
-	if (audio)
+	if (audio && soundno != -1) {
 		audio->playSFX(soundno, 0x80, _itemNum, 1);
+		_playedSound = true;
+	}
 }
 
 void SurrenderProcess::saveData(Common::WriteStream *ws) {