[Scummvm-git-logs] scummvm master -> 101b47623f4916e96698987f8ad6404bfa7fcfbf

[mgerhardy]

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

Summary:
e696fc3a12 TWINE: eliminate dead code
1148ecaddd TWINE: reduced scope of extraIdx variable
101b47623f TWINE: sanity check for fallback animation


Commit: e696fc3a122f5a17db9a8d7a9f2a67da323700da
    https://github.com/scummvm/scummvm/commit/e696fc3a122f5a17db9a8d7a9f2a67da323700da
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-10-02T14:08:29+02:00

Commit Message:
TWINE: eliminate dead code

Changed paths:
    engines/twine/menu/menuoptions.cpp


diff --git a/engines/twine/menu/menuoptions.cpp b/engines/twine/menu/menuoptions.cpp
index a183b8633ec..833b5170b42 100644
--- a/engines/twine/menu/menuoptions.cpp
+++ b/engines/twine/menu/menuoptions.cpp
@@ -374,17 +374,15 @@ int MenuOptions::chooseSave(TextId textIdx, bool showEmptySlots) {
 		}
 	}
 
-	for (;;) {
-		const int32 id = _engine->_menu->processMenu(&saveFiles);
-		switch (id) {
-		case kQuitEngine:
-		case (int32)TextId::kReturnMenu:
-			return -1;
-		default:
-			const int16 slot = saveFiles.getButtonState(id) - 1;
-			debug("Selected savegame slot %d", slot);
-			return slot;
-		}
+	const int32 id = _engine->_menu->processMenu(&saveFiles);
+	switch (id) {
+	case kQuitEngine:
+	case (int32)TextId::kReturnMenu:
+		return -1;
+	default:
+		const int slot = saveFiles.getButtonState(id) - 1;
+		debug("Selected savegame slot %d", slot);
+		return slot;
 	}
 
 	return -1;


Commit: 1148ecadddd7ced3137a85188e66c48f8a75cca1
    https://github.com/scummvm/scummvm/commit/1148ecadddd7ced3137a85188e66c48f8a75cca1
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-10-02T14:08:29+02:00

Commit Message:
TWINE: reduced scope of extraIdx variable

Changed paths:
    engines/twine/scene/extra.cpp


diff --git a/engines/twine/scene/extra.cpp b/engines/twine/scene/extra.cpp
index ae1cb70a8e2..dd5f8adea02 100644
--- a/engines/twine/scene/extra.cpp
+++ b/engines/twine/scene/extra.cpp
@@ -338,7 +338,6 @@ int32 Extra::addExtraAimingAtKey(int32 actorIdx, int32 x, int32 y, int32 z, int3
 void Extra::addExtraThrowMagicball(int32 x, int32 y, int32 z, int32 xAngle, int32 yAngle, int32 xRotPoint, int32 extraAngle) {
 	int32 ballSprite = -1;
 	int32 ballStrength = 0;
-	int32 extraIdx = -1;
 
 	switch (_engine->_gameState->_magicLevelIdx) {
 	case 0:
@@ -365,7 +364,7 @@ void Extra::addExtraThrowMagicball(int32 x, int32 y, int32 z, int32 xAngle, int3
 		_engine->_gameState->_magicBallNumBounce = 0;
 	}
 
-	extraIdx = findExtraKey();
+	const int32 extraIdx = findExtraKey();
 	if (extraIdx != -1) { // there is a key to aim
 		_engine->_gameState->_magicBallNumBounce = 5;
 	}


Commit: 101b47623f4916e96698987f8ad6404bfa7fcfbf
    https://github.com/scummvm/scummvm/commit/101b47623f4916e96698987f8ad6404bfa7fcfbf
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-10-02T14:08:29+02:00

Commit Message:
TWINE: sanity check for fallback animation

if that animation could not get found, we access the animdata with a negative array index
(just a theoretical issue though)

Changed paths:
    engines/twine/scene/animations.cpp


diff --git a/engines/twine/scene/animations.cpp b/engines/twine/scene/animations.cpp
index 042303685c3..f3346feff33 100644
--- a/engines/twine/scene/animations.cpp
+++ b/engines/twine/scene/animations.cpp
@@ -409,6 +409,9 @@ bool Animations::initAnim(AnimationTypes newAnim, AnimType animType, AnimationTy
 
 	if (animIndex == -1) {
 		animIndex = getBodyAnimIndex(AnimationTypes::kStanding, actorIdx);
+		if (animIndex == -1) {
+			error("Could not find anim index for 'standing' (actor %i)", actorIdx);
+		}
 	}
 
 	if (animType != AnimType::kAnimationSet && actor->_animType == AnimType::kAnimationAllThen) {