diff options
| author | Nicola Mettifogo | 2009-03-29 13:56:16 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2009-03-29 13:56:16 +0000 |
| commit | 666f0720ab801e8e9df4a8e65f452044b110f7b2 (patch) | |
| tree | 92ab19ec096d2335463e6545ee8ca215f8e5b451 /engines/parallaction/parallaction.cpp | |
| parent | 340b0e632eabec16a9ee07545bc57b9ca6f78660 (diff) | |
| download | scummvm-rg350-666f0720ab801e8e9df4a8e65f452044b110f7b2.tar.gz scummvm-rg350-666f0720ab801e8e9df4a8e65f452044b110f7b2.tar.bz2 scummvm-rg350-666f0720ab801e8e9df4a8e65f452044b110f7b2.zip | |
(Re)link bounding animations after location has been completely parsed. This avoids problems due to forward references.
svn-id: r39740
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index ffb336f40f..be33bfdaa9 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -728,7 +728,9 @@ bool Parallaction::checkLinkedAnimBox(ZonePtr z, uint32 type, uint x, uint y) { if (z->_flags & kFlagsRemove) return false; - if ((z->_flags & kFlagsAnimLinked) == 0) + // flag kFlagsAnimLinked may be on, but the animation may not be loaded, so + // we must use the animation reference to check here + if (!z->_linkedAnim) return false; debugC(5, kDebugExec, "checkLinkedAnimBox for %s (type = %x, x = %i, y = %i)", z->_name, type, x, y); |