[Scummvm-git-logs] scummvm branch-3-0 -> 8dc9c1bcfeeaad87d97e25ea43c13222b9755c8e

[mgerhardy]

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

Summary:
40f11463a4 TWINE: autosave descriptions encoded in utf8 now
8dc9c1bcfe TWINE: fixed imgui assert for using ImGuiInputTextFlags_EnterReturnsTrue for ScalarInput


Commit: 40f11463a4ae234d4be270828cb8b46bc6aeccd9
    https://github.com/scummvm/scummvm/commit/40f11463a4ae234d4be270828cb8b46bc6aeccd9
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2025-12-07T12:23:44+01:00

Commit Message:
TWINE: autosave descriptions encoded in utf8 now

Changed paths:
    engines/twine/twine.cpp


diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 7406aa16a7d..c903de2629a 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -477,8 +477,9 @@ Common::Error TwinEEngine::saveGameStream(Common::WriteStream *stream, bool isAu
 }
 
 void TwinEEngine::autoSave() {
-	debug("Autosave %s", _gameState->_sceneName);
-	saveGameState(getAutosaveSlot(), _gameState->_sceneName, true);
+	Common::U32String originalSceneName(_gameState->_sceneName, Common::kDos850);
+	const Common::String sceneName = originalSceneName.encode(Common::kUtf8);
+	saveGameState(getAutosaveSlot(), sceneName, true);
 }
 
 void TwinEEngine::allocVideoMemory(int32 w, int32 h) {


Commit: 8dc9c1bcfeeaad87d97e25ea43c13222b9755c8e
    https://github.com/scummvm/scummvm/commit/8dc9c1bcfeeaad87d97e25ea43c13222b9755c8e
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2025-12-07T12:23:48+01:00

Commit Message:
TWINE: fixed imgui assert for using ImGuiInputTextFlags_EnterReturnsTrue for ScalarInput

Changed paths:
    engines/twine/debugger/debugtools.cpp


diff --git a/engines/twine/debugger/debugtools.cpp b/engines/twine/debugger/debugtools.cpp
index 8eca01f0c25..9a56700c310 100644
--- a/engines/twine/debugger/debugtools.cpp
+++ b/engines/twine/debugger/debugtools.cpp
@@ -50,7 +50,8 @@ namespace ImGuiEx {
 
 bool InputIVec3(const char *label, TwinE::IVec3 &v, ImGuiInputTextFlags flags = 0) {
 	int tmp[3] = {v.x, v.y, v.z};
-	if (ImGui::InputInt3(label, tmp, flags)) {
+	ImGui::InputInt3(label, tmp, flags);
+	if (ImGui::IsItemDeactivatedAfterEdit()) {
 		v.x = tmp[0];
 		v.y = tmp[1];
 		v.z = tmp[2];
@@ -72,14 +73,14 @@ bool InputAngle(const char *label, int32 *v, int step = 1, int step_fast = 100,
 bool InputBoundingBox(ImGuiID id, const char *prefixLabel, TwinE::BoundingBox &bbox) {
 	TwinE::BoundingBox copy = bbox;
 	Common::String idStr = Common::String::format("%s mins##mins%u", prefixLabel, id);
-	if (ImGuiEx::InputIVec3(idStr.c_str(), copy.mins, ImGuiInputTextFlags_EnterReturnsTrue)) {
+	if (ImGuiEx::InputIVec3(idStr.c_str(), copy.mins)) {
 		if (copy.isValid()) {
 			bbox.mins = copy.mins;
 		}
 		return true;
 	}
 	idStr = Common::String::format("%s maxs##maxs%u", prefixLabel, id);
-	if (ImGuiEx::InputIVec3(idStr.c_str(), copy.maxs, ImGuiInputTextFlags_EnterReturnsTrue)) {
+	if (ImGuiEx::InputIVec3(idStr.c_str(), copy.maxs)) {
 		if (copy.isValid()) {
 			bbox.maxs = copy.maxs;
 		}