[Scummvm-cvs-logs] scummvm master -> bf4ab6d52af065b424ec29e1fb8205527af5a060
dreammaster
dreammaster at scummvm.org
Wed Dec 2 03:50:39 CET 2015
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:
bf4ab6d52a TINSEL: Remove redundant assert check in SetHookScene
Commit: bf4ab6d52af065b424ec29e1fb8205527af5a060
https://github.com/scummvm/scummvm/commit/bf4ab6d52af065b424ec29e1fb8205527af5a060
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-12-01T21:48:14-05:00
Commit Message:
TINSEL: Remove redundant assert check in SetHookScene
In the original, a second SetHookScene call can validly occur due to first
placing the cover-switched book in the bookcase, and then by the thief
leaving if his arrival happens immediately.
Changed paths:
engines/tinsel/tinsel.cpp
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 6dc8e3b..77932a5 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -528,8 +528,6 @@ void SetNewScene(SCNHANDLE scene, int entrance, int transition) {
* Store a scene as hooked
*/
void SetHookScene(SCNHANDLE scene, int entrance, int transition) {
- assert(g_HookScene.scene == 0); // scene already hooked
-
g_HookScene.scene = scene;
g_HookScene.entry = entrance;
g_HookScene.trans = transition;
More information about the Scummvm-git-logs
mailing list