[Scummvm-git-logs] scummvm master -> 3bd95cbeb53c25c0102f9f67837a42d671c38165

dreammaster dreammaster at scummvm.org
Sun Jun 20 18:34:42 UTC 2021


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:
3bd95cbeb5 AGS: Fix crash in MMM 23 ending


Commit: 3bd95cbeb53c25c0102f9f67837a42d671c38165
    https://github.com/scummvm/scummvm/commit/3bd95cbeb53c25c0102f9f67837a42d671c38165
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-06-20T11:33:37-07:00

Commit Message:
AGS: Fix crash in MMM 23 ending

This fixes bug #12605 by changing the error to a warning

Changed paths:
    engines/ags/engine/ac/draw.cpp


diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index bc76a9e642..95dda4b642 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -1525,8 +1525,9 @@ void prepare_characters_for_drawing() {
 
 		if ((chin->loop >= _G(views)[chin->view].numLoops) ||
 		        (_G(views)[chin->view].loops[chin->loop].numFrames < 1)) {
-			quitprintf("!The character '%s' could not be displayed because there were no frames in loop %d of view %d.",
+			warning("The character '%s' could not be displayed because there were no frames in loop %d of view %d.",
 			           chin->name, chin->loop, chin->view + 1);
+			continue;
 		}
 
 		sppic = _G(views)[chin->view].loops[chin->loop].frames[chin->frame].pic;




More information about the Scummvm-git-logs mailing list