[Scummvm-git-logs] scummvm master -> 6f500030734a684c42382f10d0eb00314d3bdfc8

dreammaster dreammaster at scummvm.org
Tue Aug 1 01:45:08 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:
6f50003073 TITANIC: Fix delay check for Bellbot/Doorbot summoner


Commit: 6f500030734a684c42382f10d0eb00314d3bdfc8
    https://github.com/scummvm/scummvm/commit/6f500030734a684c42382f10d0eb00314d3bdfc8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-31T19:45:02-04:00

Commit Message:
TITANIC: Fix delay check for Bellbot/Doorbot summoner

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


diff --git a/engines/titanic/game/idle_summoner.cpp b/engines/titanic/game/idle_summoner.cpp
index dd3aa09..28a73da 100644
--- a/engines/titanic/game/idle_summoner.cpp
+++ b/engines/titanic/game/idle_summoner.cpp
@@ -81,7 +81,7 @@ bool CIdleSummoner::TimerMsg(CTimerMsg *msg) {
 
 		int region = talkGetDialRegion("BellBot", 1);
 		uint delay = region == 1 ? 15000 : 120000;
-		uint enterTicks = MIN(getNodeEnterTicks(), _ticks);
+		uint enterTicks = MAX(getNodeEnterTicks(), _ticks);
 
 		CString name;
 		uint ticks = getTicksCount() - enterTicks;





More information about the Scummvm-git-logs mailing list