[Scummvm-cvs-logs] scummvm master -> 53a2c30cb014997887e29f5fd0db1348d05990f0

[bluegr]

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:
53a2c30cb0 ZVISION: Fix script bug #6791 (max value of delay_render)


Commit: 53a2c30cb014997887e29f5fd0db1348d05990f0
    https://github.com/scummvm/scummvm/commit/53a2c30cb014997887e29f5fd0db1348d05990f0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-02-14T15:27:01+02:00

Commit Message:
ZVISION: Fix script bug #6791 (max value of delay_render)

This fixes the delay outside the Frobozz Electric building.
In all other places, delay_render is called with a value
ranging from 1 to 10, so the 100 here looks to be a script
bug, and causes an unnecessary long pause in that scene.
Thus, we're capping the frame delay value to 10.

Changed paths:
    engines/zvision/scripting/actions.cpp



diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 90d32e4..21c97e7 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -217,6 +217,9 @@ ActionDelayRender::ActionDelayRender(ZVision *engine, int32 slotkey, const Commo
 	ResultAction(engine, slotkey) {
 	_framesToDelay = 0;
 	sscanf(line.c_str(), "%u", &_framesToDelay);
+	// Limit to 10 frames maximum. This fixes the script bug in ZGI scene px10
+	// (outside Frobozz Electric building), where this is set to 100 (bug #6791).
+	_framesToDelay = MIN<uint32>(_framesToDelay, 10);
 }
 
 bool ActionDelayRender::execute() {