[Scummvm-git-logs] scummvm master -> 83fe65b2782b28788bbc56ddb8a337895b1ccacd

[dreammaster]

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:
50471cb1ca MADS: DRAGONSPHERE: Disable interface immediately on conv start
83fe65b278 MADS: DRAGONSPHERE: Fix reaeching castle at endgame


Commit: 50471cb1ca4e6705f1fd7681872b592aac82181b
    https://github.com/scummvm/scummvm/commit/50471cb1ca4e6705f1fd7681872b592aac82181b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-04T11:35:14+10:00

Commit Message:
MADS: DRAGONSPHERE: Disable interface immediately on conv start

Changed paths:
    engines/mads/madsv2/core/conv.cpp
    engines/mads/madsv2/core/inter.cpp


diff --git a/engines/mads/madsv2/core/conv.cpp b/engines/mads/madsv2/core/conv.cpp
index 13e327046bb..e418a5bc6fb 100644
--- a/engines/mads/madsv2/core/conv.cpp
+++ b/engines/mads/madsv2/core/conv.cpp
@@ -38,7 +38,7 @@
 #include "mads/madsv2/core/mem.h"
 #include "mads/madsv2/core/popup.h"
 #include "mads/madsv2/core/speech.h"
-#include "mads/mads.h"
+#include "mads/madsv2/engine.h"
 
 namespace MADS {
 namespace MADSV2 {
@@ -1312,6 +1312,11 @@ void conv_run(int convId) {
 		kernel_new_palette();
 
 	player.commands_allowed = 0;
+
+	if (g_engine->getGameID() == GType_Dragonsphere) {
+		kernel_init_dialog();
+		kernel_set_interface_mode(INTER_CONVERSATION);
+	}
 }
 
 // ---------------------------------------------------------------------------
diff --git a/engines/mads/madsv2/core/inter.cpp b/engines/mads/madsv2/core/inter.cpp
index 16a0b0bbdd5..246b40aac58 100644
--- a/engines/mads/madsv2/core/inter.cpp
+++ b/engines/mads/madsv2/core/inter.cpp
@@ -1928,16 +1928,15 @@ void inter_spin_object(int object_id) {
 
 	// Update to live screen chunk of interface that selected object
 	// is on (it has been deleted in list by now)
-	if (kernel_mode == KERNEL_ACTIVE_CODE) {
-		video_update(&scr_inter, OUAF_OBJECT_X, 0,
-			OUAF_OBJECT_X, 156,
-			59, 44);
+	if (kernel_mode == KERNEL_ACTIVE_CODE && g_engine->getGameID() == GType_Forest) {
+		video_update(&scr_inter, OUAF_OBJECT_X, 0, OUAF_OBJECT_X, 156, 59, 44);
 	}
 
-	if (!inter_spinning_objects) goto done;
+	if (!inter_spinning_objects)
+		goto done;
 
-	if (inter_input_mode == INTER_BUILDING_SENTENCES ||
-		inter_input_mode == INTER_LIMITED_SENTENCES) inter_screen_update();
+	if (inter_input_mode == INTER_BUILDING_SENTENCES || inter_input_mode == INTER_LIMITED_SENTENCES)
+		inter_screen_update();
 
 	if (inter_object_routine == NULL) {
 		Common::strcpy_s(temp_buf, "*OB");


Commit: 83fe65b2782b28788bbc56ddb8a337895b1ccacd
    https://github.com/scummvm/scummvm/commit/83fe65b2782b28788bbc56ddb8a337895b1ccacd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-04T11:35:14+10:00

Commit Message:
MADS: DRAGONSPHERE: Fix reaeching castle at endgame

Changed paths:
    engines/mads/madsv2/dragonsphere/rooms/room104.cpp
    engines/mads/madsv2/dragonsphere/rooms/room116.cpp


diff --git a/engines/mads/madsv2/dragonsphere/rooms/room104.cpp b/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
index cb455e2362a..a515489d043 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room104.cpp
@@ -201,7 +201,7 @@ static void room_104_init() {
 	}
 
 	// Flip MacMorn hotspot off to prevent palette fragmentation
-	kernel_flip_hotspot(350, false);  // words_MacMorn
+	kernel_flip_hotspot(words_MacMorn, false);
 
 	// Zero runtime state on fresh room entry (not when restoring a saved game)
 	if (previous_room != KERNEL_RESTORING_GAME) {
@@ -378,7 +378,7 @@ static void room_104_init() {
 			kernel_dynamic_anim(id, aa[2], 0);
 		}
 
-		kernel_flip_hotspot(350, true);   // words_MacMorn — visible now
+		kernel_flip_hotspot(words_MacMorn, true);
 
 		{
 			int16 id = kernel_add_dynamic(291, 13, SYNTAX_MASC_NOT_PROPER,
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room116.cpp b/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
index 347a79d569e..78da0968ace 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
@@ -497,7 +497,7 @@ static void room_116_parser() {
 			if (global[king_status] == KING_WITH_SOUL && !global[king_is_in_stairwell]) {
 				kernel_abort_animation(aa[1]);
 				local->anim_1_running = false;
-				aa[0] = kernel_run_animation(kernel_name('B', -1), 0);
+				aa[0] = kernel_run_animation(kernel_name('B', -1), 5);
 				local->animation_running = KING_THRU_DOOR;
 			}