[Scummvm-cvs-logs] scummvm branch-1-3-0 -> 47e7850b91a12a69ff4a65e9f0cf899d6f280049

wjp wjp at usecode.org
Fri May 13 23:31:08 CEST 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7b27923281 SCI: Avoid incrementing lockers of deleted script
47e7850b91 SCI: Fix crash in vo with unloaded superclass


Commit: 7b2792328153024ef8ffd23050393ddb3098f6b0
    https://github.com/scummvm/scummvm/commit/7b2792328153024ef8ffd23050393ddb3098f6b0
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-05-13T14:29:05-07:00

Commit Message:
SCI: Avoid incrementing lockers of deleted script

Having a deleted script with non-zero lockers had the side effect of
making the deleted script re-appear in the GC's work list, including
any (deleted) objects in the script.

This should be the root cause of bugs #3299458 and #3295849, so
also delete the workaround added for that in be5d448d.
(cherry picked from commit c01fed7159c313680e55458efb6529d332ebc8b0)

Changed paths:
    engines/sci/engine/gc.cpp
    engines/sci/engine/kscripts.cpp
    engines/sci/engine/script.cpp




Commit: 47e7850b91a12a69ff4a65e9f0cf899d6f280049
    https://github.com/scummvm/scummvm/commit/47e7850b91a12a69ff4a65e9f0cf899d6f280049
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-05-13T14:29:23-07:00

Commit Message:
SCI: Fix crash in vo with unloaded superclass

(cherry picked from commit 5fc5265b0d777744e8ff65305ddf0cf2da043204)

Changed paths:
    engines/sci/console.cpp








More information about the Scummvm-git-logs mailing list