[Scummvm-git-logs] scummvm master -> 911baf606744f562aa6979ecafd59f5a10408cf2

[sluicebox]

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:
911baf6067 TINSEL: Improve `scene` debugger command


Commit: 911baf606744f562aa6979ecafd59f5a10408cf2
    https://github.com/scummvm/scummvm/commit/911baf606744f562aa6979ecafd59f5a10408cf2
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2026-03-10T16:25:11-05:00

Commit Message:
TINSEL: Improve `scene` debugger command

Changed paths:
    engines/tinsel/debugger.cpp


diff --git a/engines/tinsel/debugger.cpp b/engines/tinsel/debugger.cpp
index 66f3719d35e..702bee887c9 100644
--- a/engines/tinsel/debugger.cpp
+++ b/engines/tinsel/debugger.cpp
@@ -116,7 +116,7 @@ bool Console::cmd_scenes(int argc, const char **argv) {
 
 bool Console::cmd_scene(int argc, const char **argv) {
 	if (argc < 1 || argc > 3) {
-		debugPrintf("%s [scene_number [entry number]]\n", argv[0]);
+		debugPrintf("%s [scene [entry number]]\n", argv[0]);
 		debugPrintf("If no parameters are given, prints the current scene.\n");
 		debugPrintf("Otherwise changes to the specified scene number. Entry number defaults to 1 if none provided\n");
 		return true;
@@ -129,10 +129,30 @@ bool Console::cmd_scene(int argc, const char **argv) {
 		return true;
 	}
 
-	uint32 sceneNumber = (uint32)strToInt(argv[1]) << SCNHANDLE_SHIFT;
+	// lookup scene by name first, then by number
+	uint32 sceneNumber = 0;
+	for (int i = 1; i < _vm->_handle->GetSceneCount(); i++) {
+		Common::String name = _vm->_handle->GetSceneName(i);
+		if (name.hasPrefixIgnoreCase(argv[1])) {
+			sceneNumber = i;
+			break;
+		}
+	}
+	if (sceneNumber == 0) {
+		sceneNumber = (uint32)strToInt(argv[1]);
+	}
+	if (!(1 <= sceneNumber && sceneNumber < (uint32)_vm->_handle->GetSceneCount())) {
+		debugPrintf("Invalid scene: %s\n", argv[1]);
+		return true;
+	}
+
 	int entryNumber = (argc >= 3) ? strToInt(argv[2]) : 1;
+	if (entryNumber < 1) {
+		debugPrintf("Invalid entry: %s\n", argv[2]);
+		return true;
+	}
 
-	SetNewScene(sceneNumber, entryNumber, TRANS_CUT);
+	SetNewScene(sceneNumber << SCNHANDLE_SHIFT, entryNumber, TRANS_CUT);
 	return false;
 }