[Scummvm-git-logs] scummvm master -> 2fd9c511d9122f9fc620f7bec6a8ae3e487a16f9

[eriktorbjorn]

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:
2fd9c511d9 BBVS: Don't draw "blank" objects (bug #13235)


Commit: 2fd9c511d9122f9fc620f7bec6a8ae3e487a16f9
    https://github.com/scummvm/scummvm/commit/2fd9c511d9122f9fc620f7bec6a8ae3e487a16f9
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-02-01T07:33:06+01:00

Commit Message:
BBVS: Don't draw "blank" objects (bug #13235)

This fixes a crash when the Hock-A-Loogie minigame ends, when
buildDrawList3() would previously try to draw every object, even ones
where 'anim' was null which caused it to crash.

I don't know if this fix is exactly what the original did, but it seems
to match the original behavior when I've tried it in Wine. I've tried
both the standalone minigame, and the minigame as it appears in the full
game.

Changed paths:
    engines/bbvs/minigames/bbloogie.cpp


diff --git a/engines/bbvs/minigames/bbloogie.cpp b/engines/bbvs/minigames/bbloogie.cpp
index e6d2ea74704..509655fdbc9 100644
--- a/engines/bbvs/minigames/bbloogie.cpp
+++ b/engines/bbvs/minigames/bbloogie.cpp
@@ -200,7 +200,7 @@ void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 2)
 			drawList.add(obj->anim->frameIndices[obj->frameIndex], obj->x, obj->y, 400);
-		else
+		else if (obj->kind != 0)
 			drawList.add(obj->anim->frameIndices[obj->frameIndex], obj->x, obj->y, obj->y + 16);
 	}