[Scummvm-git-logs] scummvm master -> 0facd9474edd8af8aac750c8108f074f4931616e

dreammaster dreammaster at scummvm.org
Sat Jun 24 03:58:13 CEST 2017


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:
0facd9474e TITANIC: Fix state handling for ship announcements


Commit: 0facd9474edd8af8aac750c8108f074f4931616e
    https://github.com/scummvm/scummvm/commit/0facd9474edd8af8aac750c8108f074f4931616e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-23T21:58:04-04:00

Commit Message:
TITANIC: Fix state handling for ship announcements

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


diff --git a/engines/titanic/game/announce.cpp b/engines/titanic/game/announce.cpp
index 04b46d5..762311b 100644
--- a/engines/titanic/game/announce.cpp
+++ b/engines/titanic/game/announce.cpp
@@ -57,7 +57,7 @@ bool CAnnounce::TimerMsg(CTimerMsg *msg) {
 	if (!_enabled)
 		return false;
 
-	if (msg->_timerCtr == 1) {
+	if (msg->_actionVal == 1) {
 		CString numStr = "0";
 		CString waveNames1[20] = {
 			"z#181.wav", "z#211.wav", "z#203.wav", "z#202.wav", "z#201.wav",
@@ -108,7 +108,7 @@ bool CAnnounce::TimerMsg(CTimerMsg *msg) {
 		if (getRandomNumber(3) == 0)
 			addTimer(2, 4000, 0);
 
-	} else if (msg->_timerCtr == 2) {
+	} else if (msg->_actionVal == 2) {
 		CParrotSpeakMsg speakMsg;
 		speakMsg._target = "Announcements";
 		speakMsg.execute("PerchedParrot");





More information about the Scummvm-git-logs mailing list