[Scummvm-git-logs] scummvm master -> 74998d487c8f7ed913e411c6d766a231f9a2cc6d

sdelamarre noreply at scummvm.org
Sun Oct 19 16:05:44 UTC 2025


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

Summary:
74998d487c GOB: Fix an edge case in o7_playVmdOrMusic when lastFrame == -3


Commit: 74998d487c8f7ed913e411c6d766a231f9a2cc6d
    https://github.com/scummvm/scummvm/commit/74998d487c8f7ed913e411c6d766a231f9a2cc6d
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2025-10-19T18:05:01+02:00

Commit Message:
GOB: Fix an edge case in o7_playVmdOrMusic when lastFrame == -3

The special behavior for props.lastFrame == -3 should be ignored if
there is no "Mult" objects array set.

Changed paths:
    engines/gob/inter_v7.cpp


diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 4759ac2ed6c..bccce93700e 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -679,7 +679,7 @@ void Inter_v7::o7_playVmdOrMusic() {
 
 		props.startFrame = 0;
 		props.lastFrame = -1;
-	} else if (props.lastFrame == -3) {
+	} else if (props.lastFrame == -3 && _vm->_mult->_objects != nullptr) {
 
 		if (file.empty()) {
 			if (props.flags & 0x400) {




More information about the Scummvm-git-logs mailing list