[Scummvm-git-logs] scummvm master -> d4623c14a133dbfbe43eacf3c3ed3f4f34d8eaa2

dreammaster dreammaster at scummvm.org
Wed Jul 26 02:45:10 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:
d4623c14a1 TITANIC: Fix Parrot responses to various chicken condiments


Commit: d4623c14a133dbfbe43eacf3c3ed3f4f34d8eaa2
    https://github.com/scummvm/scummvm/commit/d4623c14a133dbfbe43eacf3c3ed3f4f34d8eaa2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-25T20:45:02-04:00

Commit Message:
TITANIC: Fix Parrot responses to various chicken condiments

Changed paths:
    engines/titanic/npcs/parrot.cpp


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index c8f833b..e5c52f9 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -598,16 +598,16 @@ bool CParrot::FrameMsg(CFrameMsg *msg) {
 		int &action = triggerMsg._action;
 		switch (triesMsg._condiment) {
 		case 1:
-			action = 280056 + (triesMsg._isHot ? 234 : 0);
+			action = triesMsg._isHot ? 280034 : 280056;
 			break;
 		case 2:
-			action = 280055 + (triesMsg._isHot ? 234 : 0);
+			action = triesMsg._isHot ? 280033 : 280055;
 			break;
 		case 3:
-			action = 280054 + (triesMsg._isHot ? 234 : 0);
+			action = triesMsg._isHot ? 280032 : 280054;
 			break;
 		default:
-			action = 280053 + (triesMsg._isHot ? 213 : 0);
+			action = triesMsg._isHot ? 280266 : 280053;
 			break;
 		}
 





More information about the Scummvm-git-logs mailing list