[Scummvm-git-logs] scummvm master -> db653b5c9849f826a2a82f07a1ba2fea6fc68a6b

dreammaster noreply at scummvm.org
Mon Aug 10 02:35:55 UTC 2026 

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

Summary:
7cf31b2d57 MADS: Removing deprecated commented out code
21a1e909fa MADS: Hook up conv_system_cleanup call
db653b5c98 MADS: Fix sound_play call in kernel_process_animation


Commit: 7cf31b2d57944b0743e66ce7e396f39a852dd943
    https://github.com/scummvm/scummvm/commit/7cf31b2d57944b0743e66ce7e396f39a852dd943
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-10T12:35:34+10:00

Commit Message:
MADS: Removing deprecated commented out code

Changed paths:
    engines/mads/core/env.cpp
    engines/mads/core/game.cpp
    engines/mads/core/game.h
    engines/mads/core/himem.cpp
    engines/mads/core/inter.cpp
    engines/mads/core/kernel.cpp
    engines/mads/core/mouse.cpp
    engines/mads/core/object.h
    engines/mads/core/pal.cpp
    engines/mads/core/sound_manager.h
    engines/mads/core/sprite_0.cpp
    engines/mads/core/sprite_k.cpp
    engines/mads/dragonsphere/dragonsphere.cpp
    engines/mads/dragonsphere/rooms/room106.cpp
    engines/mads/dragonsphere/rooms/room110.cpp
    engines/mads/dragonsphere/rooms/room113.cpp
    engines/mads/dragonsphere/rooms/room120.cpp
    engines/mads/dragonsphere/rooms/room201.cpp
    engines/mads/dragonsphere/rooms/room609.cpp
    engines/mads/dragonsphere/rooms/room613.cpp
    engines/mads/dragonsphere/sound/asound.cpp
    engines/mads/forest/global.cpp
    engines/mads/forest/main.cpp
    engines/mads/nebular/extra.cpp
    engines/mads/nebular/main.cpp
    engines/mads/nebular/main_menu.cpp
    engines/mads/nebular/menus.cpp
    engines/mads/nebular/rooms/room353.cpp
    engines/mads/nebular/rooms/room354.cpp
    engines/mads/nebular/sound/rsound.h
    engines/mads/phantom/phantom.cpp
    engines/mads/phantom/rooms/room101.cpp
    engines/mads/phantom/rooms/room304.cpp
    engines/mads/phantom/rooms/room305.cpp
    engines/mads/phantom/rooms/room406.cpp
    engines/mads/phantom/rooms/room409.cpp
    engines/mads/phantom/rooms/room502.cpp
    engines/mads/phantom/rooms/room504.cpp
    engines/mads/phantom/rooms/room505.cpp
    engines/mads/phantom/sound/asound.cpp


diff --git a/engines/mads/core/env.cpp b/engines/mads/core/env.cpp
index 9e800cfcf8f..7edcbeccf0c 100644
--- a/engines/mads/core/env.cpp
+++ b/engines/mads/core/env.cpp
@@ -578,7 +578,6 @@ char *env_get_level_path(char *out, int item_type, const char *file_spec, int fi
 	if ((item_type == SECTION) || (item_type == ROOM)) {
 		if ((item_type == ROOM) && (first_level == 0)) {
 			first_level = second_level / 100;
-			// first_level = room_get_section (second_level);
 		}
 	}
 
diff --git a/engines/mads/core/game.cpp b/engines/mads/core/game.cpp
index 824b0c110e1..10965625763 100644
--- a/engines/mads/core/game.cpp
+++ b/engines/mads/core/game.cpp
@@ -1033,7 +1033,6 @@ int game_parse_keystroke(int mykey) {
 
 	case ctrl_k_key:
 		inter_report_hotspots = !inter_report_hotspots;
-		// config_file.interface_hotspots = inter_report_hotspots ? INTERFACE_BRAINDEAD : INTERFACE_MACINTOSH;
 		inter_init_sentence();
 		break;
 
@@ -1259,12 +1258,10 @@ void game_control() {
 				g_engine->getGameID() == GType_RexNebular || !player.walker_is_loaded);
 
 			quote_emergency = false;
-			// vocab_emergency = false;
 			game_wait_cursor();
 
 			kernel.quotes = NULL;
 
-			// vocab_init_active();
 			kernel_init_dynamic();
 
 			game_exec_function(section_room_constructor);
@@ -2069,8 +2066,6 @@ done:
 }
 
 void game_debugger_reset() {
-	//screen = mono_text_video;
-
 	screen_normal_color = colorbyte(hi_white, black);
 	screen_hilite_color = screen_normal_color + 128;
 
@@ -2091,7 +2086,6 @@ static void game_main_update() {
 	screen_printf(0, 2, "%-3d, %-3d Mem: %-6ld Min: %-6ld", room_id, previous_room, mem_get_avail(), mem_min_free);
 
 	screen_printf(0, 4, "%s @ %3d, %3d Dpt: %d   ", player.series_name, player.x, player.y, player.depth);
-	// screen_printf (0, 5, "        Series: %d   Sprite: %-2d   Mirror: %-2d   Frame Rate: %d    ", player.series, player.sprite, player.mirror, player.frame_delay);
 	screen_printf(0, 7, "Sc: %-3d  Fr %d => %d%, Bk %d => %d%", player.scale, room->front_y, room->front_scale, room->back_y, room->back_scale);
 
 	if (!player.walker_visible) {
@@ -2249,8 +2243,6 @@ static void game_palette_update() {
 			delta = old_free - free;
 		}
 
-		// screen_printf (0, 22, "Free: %-3d", free);
-		// screen_printf (0, 23, "Previous: %-3d", old_free);
 		screen_printf(0, 24, "Added: %-3d", delta);
 
 
@@ -2442,29 +2434,30 @@ static void game_matte() {
 		if (count < image_max) {
 			switch (image_list[count].flags) {
 			case IMAGE_UPDATE:
-				// Common::strcpy_s (flags_buf, "Update");
+				Common::strcpy_s (flags_buf, "Update");
 				break;
 
 			case IMAGE_STATIC:
-				// Common::strcpy_s (flags_buf, "Static");
+				Common::strcpy_s (flags_buf, "Static");
 				break;
 
 			case IMAGE_ERASE:
-				// Common::strcpy_s (flags_buf, "Erase");
+				Common::strcpy_s (flags_buf, "Erase");
 				break;
 
 			case IMAGE_REFRESH:
-				// Common::strcpy_s (flags_buf, "Refresh");
+				Common::strcpy_s (flags_buf, "Refresh");
 				break;
 
 			case IMAGE_DELTA:
-				// Common::strcpy_s (flags_buf, "Delta");
+				Common::strcpy_s (flags_buf, "Delta");
 				break;
 
 			default:
 				Common::sprintf_s(flags_buf, "(%d)", image_list[count].flags);
 				break;
 			}
+
 			if (image_list[count].flags != IMAGE_REFRESH) {
 				series_id = image_list[count].series_id;
 				Common::strcpy_s(name_buf, series_name[series_id]);
diff --git a/engines/mads/core/game.h b/engines/mads/core/game.h
index beeb070989a..54dd866c22e 100644
--- a/engines/mads/core/game.h
+++ b/engines/mads/core/game.h
@@ -108,8 +108,6 @@ extern int selected_intro;
 
 #define EXTRA_MAX_INV_OBJECTS 18   /* 16, + background, + open backpack */
 
-/* int inven_ss[EXTRA_MAX_INV_OBJECTS]; */
-/* int inven_seq[EXTRA_MAX_INV_OBJECTS]; */
 
 
 /* Declared by Taranjeet for OUAF Journal */
diff --git a/engines/mads/core/himem.cpp b/engines/mads/core/himem.cpp
index 66a37771978..79ed0c3a51c 100644
--- a/engines/mads/core/himem.cpp
+++ b/engines/mads/core/himem.cpp
@@ -306,7 +306,6 @@ int himem_preload(char *filename, int level) {
 			if (ems_copy_it_up(new_handle, &page_marker, &page_offset, load_buf, read_size)) goto done;
 		} else {
 
-			// printf ("Record %d (Size: %ld, Offset: %ld)\n", count, read_size, xms_offset);
 			if (xms_copy(read_size,
 				MEM_CONV, load_buf,
 				xms_handle, (XMS)xms_offset)) goto done;
diff --git a/engines/mads/core/inter.cpp b/engines/mads/core/inter.cpp
index 7297c8cda81..87aa08159f8 100644
--- a/engines/mads/core/inter.cpp
+++ b/engines/mads/core/inter.cpp
@@ -599,12 +599,6 @@ void inter_prepare_background() {
 }
 
 static void inter_refresh() {
-	// int count;
-	// for (count = 0; count < (int)image_inter_marker; count++) {
-	// if (image_inter_list[count].segment_id == INTER_SPINNING_OBJECT) {
-	// image_inter_list[count].flags = IMAGE_REFRESH + IMAGE_UPDATE_ONLY;
-	// }
-	// }
 	image_inter_marker = 0;
 	matte_refresh_inter();
 
@@ -1420,7 +1414,6 @@ static void inter_compile_sentence() {
 
 			inter_add_word_to_sentence(inter_verb, true);
 			if (inter_verb == words_look) {
-				// inter_prep = PREP_AT;
 				Common::strcat_s(inter_sentence, istring_prep_names[PREP_AT]);
 				Common::strcat_s(inter_sentence, istring_space);
 			}
diff --git a/engines/mads/core/kernel.cpp b/engines/mads/core/kernel.cpp
index fa0fefe5a2d..7448ace2eb6 100644
--- a/engines/mads/core/kernel.cpp
+++ b/engines/mads/core/kernel.cpp
@@ -215,7 +215,6 @@ void kernel_game_shutdown() {
 	pack_set_special_buffer(NULL, NULL);
 
 	object_unload();
-	// inter_deallocate_objects();
 	popup_available = false;
 
 	// Remove special keyboard handler
diff --git a/engines/mads/core/mouse.cpp b/engines/mads/core/mouse.cpp
index 1de369301bb..70b27fd7d60 100644
--- a/engines/mads/core/mouse.cpp
+++ b/engines/mads/core/mouse.cpp
@@ -96,7 +96,6 @@ void mouse_begin_cycle(int double_flag) {
 
 	mouse_status = mouse_get_status(&mouse_x, &mouse_y);
 	mouse_clock = timer_read();
-	// mouse_video_mode = mouse_get_video_mode();
 	mouse_stop_stroke = (mouse_latched && (!mouse_status));
 	mouse_start_stroke = (mouse_status && !mouse_stroke_going);
 	mouse_stroke_going = mouse_status;
diff --git a/engines/mads/core/object.h b/engines/mads/core/object.h
index 494e0c9139c..f75ceb0bbb9 100644
--- a/engines/mads/core/object.h
+++ b/engines/mads/core/object.h
@@ -65,7 +65,6 @@ struct FileObjectBuf {
 	HagVerb verb[OBJECT_MAX_VERBS];
 	char quality_name[OBJECT_MAX_QUALITIES][QU_MAXWORDLEN + 1];
 	int32 quality_value[OBJECT_MAX_QUALITIES];
-	/* char short_name[OBJECT_SHORT_NAME_LEN + 1]; */
 };
 
 typedef FileObjectBuf FileObject;
diff --git a/engines/mads/core/pal.cpp b/engines/mads/core/pal.cpp
index f952c23d735..4571aa877c3 100644
--- a/engines/mads/core/pal.cpp
+++ b/engines/mads/core/pal.cpp
@@ -473,7 +473,6 @@ int pal_allocate(ColorListPtr new_list, ShadowListPtr shadow_list, int pal_flags
 					found = true;
 					best_target_color = target_color;
 					*(RGBcolor *) &master_palette[target_color].r = *(RGBcolor *) & new_list->table[list_color].r;
-					// memcpy(&(master_palette[target_color].r), &(new_list->table[list_color].r), 3);
 				}
 			}
 		}
diff --git a/engines/mads/core/sound_manager.h b/engines/mads/core/sound_manager.h
index 22696f6cf90..de6bbd35aff 100644
--- a/engines/mads/core/sound_manager.h
+++ b/engines/mads/core/sound_manager.h
@@ -108,8 +108,6 @@ public:
 	SoundManager(Audio::Mixer *mixer, bool &soundFlag);
 	virtual ~SoundManager();
 
-	//bool _preferRoland = false;
-
 	/**
 	 * Validate the sound driver files needed for data
 	 */
diff --git a/engines/mads/core/sprite_0.cpp b/engines/mads/core/sprite_0.cpp
index 260e1289797..31c92f461d1 100644
--- a/engines/mads/core/sprite_0.cpp
+++ b/engines/mads/core/sprite_0.cpp
@@ -298,7 +298,6 @@ ys = sprite->ys;
 	}
 
 	skip_y = cx;
-	//draw_y = bx;
 	stop_y = cx + bx;
 
 	if (bx <= 0)
diff --git a/engines/mads/core/sprite_k.cpp b/engines/mads/core/sprite_k.cpp
index 7de4dcb5faa..8de469af54e 100644
--- a/engines/mads/core/sprite_k.cpp
+++ b/engines/mads/core/sprite_k.cpp
@@ -59,7 +59,6 @@ void fastcall sprite_free(SeriesPtr *series, int free_memory) {
 	if (kidney) {
 		/* release the flag - dont deallocate the colors from the list */
 		if ((*series)->color_handle) pal_deallocate((*series)->color_handle);
-		/* flag_used[(*series)->color_handle] = false; */
 	} else {
 		/* deallocate the colors from the list */
 		if ((*series)->color_handle) pal_deallocate((*series)->color_handle);
diff --git a/engines/mads/dragonsphere/dragonsphere.cpp b/engines/mads/dragonsphere/dragonsphere.cpp
index fe126226323..8b6e30d37b1 100644
--- a/engines/mads/dragonsphere/dragonsphere.cpp
+++ b/engines/mads/dragonsphere/dragonsphere.cpp
@@ -87,8 +87,6 @@ void DragonsphereEngine::global_init_code() {
 		global[count] = 0;
 	}
 
-	/* initialize_grid (); */
-
 	global[grid_position] = 5;
 	global[grid_position + 1] = 4;
 	global[grid_position + 2] = 9;
diff --git a/engines/mads/dragonsphere/rooms/room106.cpp b/engines/mads/dragonsphere/rooms/room106.cpp
index 61f3facdb56..d7f7401cf20 100644
--- a/engines/mads/dragonsphere/rooms/room106.cpp
+++ b/engines/mads/dragonsphere/rooms/room106.cpp
@@ -701,13 +701,11 @@ static void handle_animation_a_queen() {
 			case QUEEN_TALK:
 				a_q_reset_frame = 3;
 				local->a_q_action = QUEEN_SHUT_UP;
-				/* local->a_q_talk_count = 100; */
 				break;
 
 			case QUEEN_FIST:
 				a_q_reset_frame = 20;
 				local->a_q_action = QUEEN_SHUT_UP;
-				/* local->a_q_talk_count = 100; */
 				break;
 
 			case QUEEN_SHUT_UP:
@@ -729,7 +727,6 @@ static void handle_animation_a_queen() {
 			case QUEEN_GET_UP:
 				a_q_reset_frame = 37;
 				local->a_q_action = QUEEN_SHUT_UP;
-				/* local->a_q_talk_count = 100; */
 				break;
 			}
 			break;
diff --git a/engines/mads/dragonsphere/rooms/room110.cpp b/engines/mads/dragonsphere/rooms/room110.cpp
index 1853eb27c06..c66a46a29bd 100644
--- a/engines/mads/dragonsphere/rooms/room110.cpp
+++ b/engines/mads/dragonsphere/rooms/room110.cpp
@@ -570,7 +570,6 @@ static void room_110_init() {
 		if (global[player_persona] == PLAYER_IS_PID) {
 
 			if (global[guard_pid_status] == GUARD_NEVER_HEALED) {
-				/* global[no_talk_to_guard] = true; */
 				player.commands_allowed = false;
 				conv_run(CONV_GUARD_PID);
 				conv_export_value(player_has(shifter_ring));
@@ -581,7 +580,6 @@ static void room_110_init() {
 				}
 
 			} else if (global[guard_pid_status] == GUARD_IS_HEALED) {
-				/* global[no_talk_to_guard] = true; */
 				player.commands_allowed = false;
 				conv_run(CONV_GUARD_HEAL);
 			}
@@ -797,7 +795,6 @@ static void handle_animation_guard_pid() {
 
 		case 45:  /* end of running Pid through */
 			global[reset_conv] = 10;
-			/* conv_reset (CONV_GUARD_PID); */
 			if (game.difficulty == EASY_MODE) {
 				text_show(11045);
 			} else {
diff --git a/engines/mads/dragonsphere/rooms/room113.cpp b/engines/mads/dragonsphere/rooms/room113.cpp
index fb7bdabd9a1..56bc501ea34 100644
--- a/engines/mads/dragonsphere/rooms/room113.cpp
+++ b/engines/mads/dragonsphere/rooms/room113.cpp
@@ -619,7 +619,6 @@ static void room_113_parser() {
 					break;
 
 				case 1:
-					/* sound_queue (N_PickUpObject006);*/
 					kernel_seq_delete(seq[fx_rare_coin]);
 					kernel_flip_hotspot(words_rare_coin, false);
 					sound_play(N_TakeObjectSnd);
@@ -698,7 +697,6 @@ static void room_113_parser() {
 					break;
 
 				case 1:
-					/* sound_queue (N_PickUpObject006);*/
 					kernel_seq_delete(seq[fx_emerald]);
 					kernel_flip_hotspot(words_emerald, false);
 					sound_play(N_TakeObjectSnd);
diff --git a/engines/mads/dragonsphere/rooms/room120.cpp b/engines/mads/dragonsphere/rooms/room120.cpp
index c5ff46564ff..7a8acc6f40d 100644
--- a/engines/mads/dragonsphere/rooms/room120.cpp
+++ b/engines/mads/dragonsphere/rooms/room120.cpp
@@ -678,7 +678,6 @@ void room_120_preload() {
 	room_parser_code_pointer = room_120_parser;
 	room_daemon_code_pointer = room_120_daemon;
 
-	/* inter_init_sentence(); */
 	section_1_walker();
 	section_1_interface();
 }
diff --git a/engines/mads/dragonsphere/rooms/room201.cpp b/engines/mads/dragonsphere/rooms/room201.cpp
index a5bd10576a4..e90195a5080 100644
--- a/engines/mads/dragonsphere/rooms/room201.cpp
+++ b/engines/mads/dragonsphere/rooms/room201.cpp
@@ -629,13 +629,9 @@ static void room_201_init() {
 
 	if (global[player_persona] == PLAYER_IS_KING && !global[dome_up]) {
 		ss[fx_testicle_1] = kernel_load_series(kernel_name('y', 0), false);
-		/* flag_used[10]     = false; */
 		ss[fx_testicle_2] = kernel_load_series(kernel_name('y', 2), false);
-		/* flag_used[10]     = false; */
 		ss[fx_testicle_3] = kernel_load_series(kernel_name('y', 3), false);
-		/* flag_used[10]     = false; */
 		ss[fx_testicle_4] = kernel_load_series(kernel_name('y', 4), false);
-		/* flag_used[10]     = false; */
 	}
 
 	ss[fx_guard_1_dead] = kernel_load_series(kernel_name('g', 2), false);
@@ -824,7 +820,6 @@ static void room_201_init() {
 	set_vine_2_position();
 	set_vine_3_position();
 
-	/* kernel_timing_trigger (10, MUSIC); */
 
 	section_2_music();
 }
@@ -1808,13 +1803,11 @@ static void process_conv_king_guards() {
 		player.commands_allowed = false;
 		local->guard_right_action = UNHALT;
 		player_walk(PLAYER_X_FROM_120, PLAYER_Y_FROM_120, FACING_WEST);
-		/* player.walking = true; */
 
 		global[pre_room] = 201;
 		if (global[dragon_my_scene] < global[dragon_high_scene]) {
 			global[dragon_my_scene]++;
 			player.walk_off_edge_to_room = 111;
-			/* local->cut_scene = true; */
 		} else {
 			player.walk_off_edge_to_room = 120;
 		}
@@ -1849,13 +1842,11 @@ static void process_conv_king_guards() {
 		you_trig_flag = true;
 		conv_abort();
 		player_walk(PLAYER_X_FROM_120, PLAYER_Y_FROM_120, FACING_WEST);
-		/* player.walking = true; */
 
 		global[pre_room] = 201;
 		if (global[dragon_my_scene] < global[dragon_high_scene]) {
 			global[dragon_my_scene]++;
 			player.walk_off_edge_to_room = 111;
-			/* local->cut_scene = true; */
 		} else {
 			player.walk_off_edge_to_room = 120;
 		}
@@ -1880,7 +1871,6 @@ static void process_conv_king_guards() {
 		conv_abort();
 		player.commands_allowed = false;
 		local->guard_left_action = DUMP_ANIMS;
-		/* local->guard_right_action = UNHALT_DUMP_ANIMS; */
 		local->guard_right_action = DUMP_ANIMS;
 	}
 
@@ -2001,11 +1991,9 @@ static void room_201_pre_parser() {
 	if (player_said_2(walk_down, path_to_west)) {
 		if (global[player_persona] == PLAYER_IS_KING) {
 			if (global[object_given_201] == -1) {
-				/* conv_reset (CONV_47_KING); */
 				global[reset_conv] = 47;
 
 				player_walk(PLAYER_X_FROM_120, PLAYER_Y_FROM_120, FACING_EAST);
-				/* player.walking = true; */
 
 				player.commands_allowed = false;
 
@@ -2015,7 +2003,6 @@ static void room_201_pre_parser() {
 						global[dragon_my_scene]++;
 					}
 					player.walk_off_edge_to_room = 111;
-					/* local->cut_scene = true; */
 
 				} else if (local->cut_scene) {
 					player.walk_off_edge_to_room = 111;
@@ -2219,10 +2206,6 @@ static void room_201_parser() {
 			player.commands_allowed = false;
 			local->guard_left_action = GIVE_NOTHING;
 
-			/* if (global[given_object_before]) { */
-			  /* local->guard_right_action = UNHALT; */
-			/* } */
-
 		} else {
 			if (player_said_1(soporific)) {
 				local->pid_action = TAKE_OUT_BOTTLE;
diff --git a/engines/mads/dragonsphere/rooms/room609.cpp b/engines/mads/dragonsphere/rooms/room609.cpp
index 91886c59a4a..971c634576b 100644
--- a/engines/mads/dragonsphere/rooms/room609.cpp
+++ b/engines/mads/dragonsphere/rooms/room609.cpp
@@ -227,7 +227,6 @@ static void room_609_daemon() {
 			local->prevent = true;
 			player_walk(DEATH_X, DEATH_Y, FACING_WEST);
 			player_walk_trigger(ROOM_609_DONE_WALK);
-			/* error_watch_point ("you're dead", kernel.trigger, kernel.trigger); */
 		}
 	}
 
diff --git a/engines/mads/dragonsphere/rooms/room613.cpp b/engines/mads/dragonsphere/rooms/room613.cpp
index 8870d7e8f49..ee77cb6012e 100644
--- a/engines/mads/dragonsphere/rooms/room613.cpp
+++ b/engines/mads/dragonsphere/rooms/room613.cpp
@@ -257,9 +257,6 @@ static void room_613_daemon() {
 		break;
 
 	case 10:
-		/* if (game.difficulty == EASY_MODE) { */
-		  /* text_show (61316); */
-		/* } */
 		player.x = local->old_x;
 		player.y = local->old_y;
 		new_room = 606;
diff --git a/engines/mads/dragonsphere/sound/asound.cpp b/engines/mads/dragonsphere/sound/asound.cpp
index 84b59a9444e..bc23b2b76ab 100644
--- a/engines/mads/dragonsphere/sound/asound.cpp
+++ b/engines/mads/dragonsphere/sound/asound.cpp
@@ -1386,7 +1386,6 @@ op2_set_vol:
 			{
 				/* "call near ptr aAsoundDriverAn+33h" - the target is a no-op. */
 				pSrc++;
-				/* ()*pSrc; */
 				ch = _activeChannelPtr;
 				ch->_pSrc += 2;
 				goto dispatch;
diff --git a/engines/mads/forest/global.cpp b/engines/mads/forest/global.cpp
index ee37e872615..befde430810 100644
--- a/engines/mads/forest/global.cpp
+++ b/engines/mads/forest/global.cpp
@@ -1196,9 +1196,6 @@ static void do_looping_sounds() {
 }
 
 void global_game_main_loop() {
-	//static char temp_buf_2[20];
-	//static char temp_buf_3[20];
-	//static char temp_buf_4[20];
 	int yy;
 	long dif;
 
diff --git a/engines/mads/forest/main.cpp b/engines/mads/forest/main.cpp
index 6a525b9f1ff..defed1c1c93 100644
--- a/engines/mads/forest/main.cpp
+++ b/engines/mads/forest/main.cpp
@@ -44,9 +44,6 @@
 namespace MADS {
 namespace Forest {
 
-//constexpr bool SHOW_LINES = true;
-//constexpr byte LINE_COLOR = 2;
-
 char *quotes;
 
 static void main_cold_data_init() {
diff --git a/engines/mads/nebular/extra.cpp b/engines/mads/nebular/extra.cpp
index d35c7828ba2..aa690a70b61 100644
--- a/engines/mads/nebular/extra.cpp
+++ b/engines/mads/nebular/extra.cpp
@@ -380,7 +380,6 @@ RoomPtr room_load(int id, int variant, const char *base_path, Buffer *picture,
 
 	width = roomfile.xs;
 	height = roomfile.ys;
-	//picSize = width * height;
 
 	if (!picture->data)
 		buffer_init(picture, width, height);
diff --git a/engines/mads/nebular/main.cpp b/engines/mads/nebular/main.cpp
index 0fb67e00b1f..0a41bde62e7 100644
--- a/engines/mads/nebular/main.cpp
+++ b/engines/mads/nebular/main.cpp
@@ -52,7 +52,6 @@
 namespace MADS {
 namespace RexNebular {
 
-//constexpr bool SHOW_LINES = true;
 constexpr byte LINE_COLOR = 2;
 
 char *quotes;
diff --git a/engines/mads/nebular/main_menu.cpp b/engines/mads/nebular/main_menu.cpp
index 2040c394bf8..3d3f801e6d9 100644
--- a/engines/mads/nebular/main_menu.cpp
+++ b/engines/mads/nebular/main_menu.cpp
@@ -233,8 +233,6 @@ static void process_menu() {
 
 	myspot = hspot_which(mouse_x, mouse_y - viewing_at_y, mcga_mode);
 
-	//current_eye = false;
-
 	if ((myspot > 0) && mouse_any_stroke && (menu_mode == MENU_ACCEPTING_COMMANDS)) {
 		current_item = spot[myspot].num;
 	} else {
diff --git a/engines/mads/nebular/menus.cpp b/engines/mads/nebular/menus.cpp
index 4ea7e154fd9..aaa656611cd 100644
--- a/engines/mads/nebular/menus.cpp
+++ b/engines/mads/nebular/menus.cpp
@@ -1060,7 +1060,6 @@ static void game_menu_options() {
 		save_config = config_file;
 	} else {
 		write_config_file();
-		//game_load_config_parameters();
 	}
 }
 
diff --git a/engines/mads/nebular/rooms/room353.cpp b/engines/mads/nebular/rooms/room353.cpp
index 8ac8223c866..c69ef3fc071 100644
--- a/engines/mads/nebular/rooms/room353.cpp
+++ b/engines/mads/nebular/rooms/room353.cpp
@@ -30,13 +30,6 @@ namespace MADS {
 namespace RexNebular {
 namespace Rooms {
 
-struct Scratch {
-
-};
-
-//static Scratch local;
-
-
 static void room_353_init() {
 	g_sprite_ids[1] = kernel_load_series(kernel_full_name(303, 'B', 0, "", KERNEL_SS), 0);
 	g_sequence_ids[1] = kernel_seq_forward(g_sprite_ids[1], false, 5, 0, 5, 0);
diff --git a/engines/mads/nebular/rooms/room354.cpp b/engines/mads/nebular/rooms/room354.cpp
index 6da91edb537..bc48a4f4fc0 100644
--- a/engines/mads/nebular/rooms/room354.cpp
+++ b/engines/mads/nebular/rooms/room354.cpp
@@ -30,12 +30,6 @@ namespace MADS {
 namespace RexNebular {
 namespace Rooms {
 
-struct Scratch {
-
-};
-
-//static Scratch local;
-
 static void room_354_init() {
 	global[kAfterHavoc] = true;
 	global[kTeleporterRoom + 1] = 351;
diff --git a/engines/mads/nebular/sound/rsound.h b/engines/mads/nebular/sound/rsound.h
index 1b17a0f7062..e47b817f3d9 100644
--- a/engines/mads/nebular/sound/rsound.h
+++ b/engines/mads/nebular/sound/rsound.h
@@ -243,8 +243,6 @@ protected:
 	// ---- Low-level MIDI send helpers -------------------------------
 	// All funnel through sendMidiByte(), the single hook point for
 	// wiring up real MT-32/MIDI output.
-	//void sendMidiByte(byte value);
-	//void sendStatus(int midiChannel, byte statusNibble);
 	void sendNoteOn(int midiChannel, int note, int velocity);
 	void sendProgramChange(int midiChannel, int program);
 	void sendVolume(int midiChannel, int volume);
diff --git a/engines/mads/phantom/phantom.cpp b/engines/mads/phantom/phantom.cpp
index 92745a42d47..1c3b50647e0 100644
--- a/engines/mads/phantom/phantom.cpp
+++ b/engines/mads/phantom/phantom.cpp
@@ -650,7 +650,6 @@ void PhantomEngine::global_parser_code() {
 			inter_move_object(rope, NOWHERE);
 			inter_give_to_player(rope_with_hook);
 			object_examine(rope_with_hook, text_008_23, 0);
-			/* text_show (text_008_23); */
 		}
 		goto handled;
 	}
diff --git a/engines/mads/phantom/rooms/room101.cpp b/engines/mads/phantom/rooms/room101.cpp
index 361bf34a769..1f4e7b4fef4 100644
--- a/engines/mads/phantom/rooms/room101.cpp
+++ b/engines/mads/phantom/rooms/room101.cpp
@@ -340,7 +340,6 @@ static void handle_animation_001() {
 			break;
 
 		case 315:  /* end of CALLING_TURN_AND_WALK */
-			/* global[brie_talk_status] = AFTER_CONVS_0_AND_1; */
 			kernel_abort_animation(aa[1]);
 			break;
 		}
diff --git a/engines/mads/phantom/rooms/room304.cpp b/engines/mads/phantom/rooms/room304.cpp
index bcb2d3d8c63..0195933e412 100644
--- a/engines/mads/phantom/rooms/room304.cpp
+++ b/engines/mads/phantom/rooms/room304.cpp
@@ -79,7 +79,6 @@ void room_304_init() {
 
 		kernel_set_interface_mode(INTER_LIMITED_SENTENCES);
 
-		/* viewing_at_y = ((video_y - display_y) >> 1); */
 
 		if (previous_room == 305) {
 			ss[fx_chan_tilt] = kernel_load_series(kernel_name('f', 0), false);
@@ -143,7 +142,6 @@ static void process_conversation_23() {
 
 	case conv023_die_b_b:
 		local->phantom_action = CONV23_PHANTOM_FIGHT;
-		/* conv_hold (); */
 		break;
 
 	case conv023_okay_abc:
diff --git a/engines/mads/phantom/rooms/room305.cpp b/engines/mads/phantom/rooms/room305.cpp
index 9123ff0b793..3cb8a6e2114 100644
--- a/engines/mads/phantom/rooms/room305.cpp
+++ b/engines/mads/phantom/rooms/room305.cpp
@@ -56,7 +56,6 @@ void room_305_init() {
 
 	global_speech_load(speech_raoul_strangle);
 
-	/* viewing_at_y = ((video_y - display_y) >> 1); */
 
 	kernel.quotes = quote_load(quote_305a0, quote_305a1, 0);
 
@@ -97,7 +96,6 @@ done:
 
 static void handle_animation_unmask() {
 	int unmask_reset_frame;
-	/* int id; */
 
 	if (kernel_anim[aa[0]].frame != local->unmask_frame) {
 		local->unmask_frame = kernel_anim[aa[0]].frame;
diff --git a/engines/mads/phantom/rooms/room406.cpp b/engines/mads/phantom/rooms/room406.cpp
index 2ba2fb3967e..51ca7aafcaa 100644
--- a/engines/mads/phantom/rooms/room406.cpp
+++ b/engines/mads/phantom/rooms/room406.cpp
@@ -402,16 +402,13 @@ void room_406_parser() {
 			seq[fx_bend_down_9] = kernel_seq_stamp
 			(ss[fx_bend_down_9], true, KERNEL_LAST);
 			kernel_seq_player(seq[fx_bend_down_9], true);
-			/* kernel_seq_depth (seq[fx_bend_down_9], 1); */
 			kernel_timing_trigger(HALF_SECOND, 3);
 			break;
 
 		case 3:
-			/* temp = seq[fx_bend_down_9]; */
 			kernel_seq_delete(seq[fx_bend_down_9]);
 			seq[fx_bend_down_9] = kernel_seq_backward(ss[fx_bend_down_9], true,
 				5, 0, 0, 1);
-			/* kernel_synch (KERNEL_SERIES, seq[fx_bend_down_9], KERNEL_SERIES, temp); */
 			kernel_seq_range(seq[fx_bend_down_9], KERNEL_FIRST, KERNEL_LAST);
 			kernel_seq_player(seq[fx_bend_down_9], false);
 			kernel_seq_trigger(seq[fx_bend_down_9],
diff --git a/engines/mads/phantom/rooms/room409.cpp b/engines/mads/phantom/rooms/room409.cpp
index 94e6f29dbf8..94081b41155 100644
--- a/engines/mads/phantom/rooms/room409.cpp
+++ b/engines/mads/phantom/rooms/room409.cpp
@@ -599,16 +599,13 @@ void room_409_parser() {
 			seq[fx_bend_down_9] = kernel_seq_stamp
 			(ss[fx_bend_down_9], false, KERNEL_LAST);
 			kernel_seq_player(seq[fx_bend_down_9], true);
-			/* kernel_seq_depth (seq[fx_bend_down_9], 1); */
 			kernel_timing_trigger(HALF_SECOND, 3);
 			break;
 
 		case 3:
-			/* temp = seq[fx_bend_down_9]; */
 			kernel_seq_delete(seq[fx_bend_down_9]);
 			seq[fx_bend_down_9] = kernel_seq_backward(ss[fx_bend_down_9], false,
 				5, 0, 0, 1);
-			/* kernel_synch (KERNEL_SERIES, seq[fx_bend_down_9], KERNEL_SERIES, temp); */
 			kernel_seq_range(seq[fx_bend_down_9], KERNEL_FIRST, KERNEL_LAST);
 			kernel_seq_player(seq[fx_bend_down_9], false);
 			kernel_seq_trigger(seq[fx_bend_down_9],
diff --git a/engines/mads/phantom/rooms/room502.cpp b/engines/mads/phantom/rooms/room502.cpp
index 03b97e38bc1..5184b1d349d 100644
--- a/engines/mads/phantom/rooms/room502.cpp
+++ b/engines/mads/phantom/rooms/room502.cpp
@@ -1042,7 +1042,6 @@ static void animate_fire_bursts() {
 			kernel_seq_range(seq[fx_fire_1], 1, 10);
 			kernel_seq_trigger(seq[fx_fire_1],
 				KERNEL_TRIGGER_EXPIRE, 0, ROOM_502_FIRE_BURST_1 + 1);
-			/* local->fire_1_on = true; */
 		}
 		break;
 
@@ -1057,7 +1056,6 @@ static void animate_fire_bursts() {
 			kernel_seq_range(seq[fx_fire_2], 1, 10);
 			kernel_seq_trigger(seq[fx_fire_2],
 				KERNEL_TRIGGER_EXPIRE, 0, ROOM_502_FIRE_BURST_2 + 1);
-			/* local->fire_2_on = true; */
 		}
 		break;
 
@@ -1072,7 +1070,6 @@ static void animate_fire_bursts() {
 			kernel_seq_range(seq[fx_fire_3], 1, 10);
 			kernel_seq_trigger(seq[fx_fire_3],
 				KERNEL_TRIGGER_EXPIRE, 0, ROOM_502_FIRE_BURST_3 + 1);
-			/* local->fire_3_on = true; */
 		}
 		break;
 
@@ -1087,7 +1084,6 @@ static void animate_fire_bursts() {
 			kernel_seq_range(seq[fx_fire_4], 1, 10);
 			kernel_seq_trigger(seq[fx_fire_4],
 				KERNEL_TRIGGER_EXPIRE, 0, ROOM_502_FIRE_BURST_4 + 1);
-			/* local->fire_4_on = true; */
 		}
 		break;
 
diff --git a/engines/mads/phantom/rooms/room504.cpp b/engines/mads/phantom/rooms/room504.cpp
index d0c54d8f451..6a9e232fc50 100644
--- a/engines/mads/phantom/rooms/room504.cpp
+++ b/engines/mads/phantom/rooms/room504.cpp
@@ -353,7 +353,6 @@ void room_504_init() {
 				kernel_draw_to_background(ss[fx_burn], 1, KERNEL_HOME, KERNEL_HOME, 0, 100);
 
 				ss[fx_test] = kernel_load_series("*CHR_3", false);
-				/* ss[fx_test]       = kernel_load_series(kernel_name('b', 0), false); */
 				ss[fx_test] = kernel_load_series("*FACERAL", PAL_MAP_ALL_TO_CLOSEST |
 					PAL_MAP_ANY_TO_CLOSEST);
 				ss[fx_test] = kernel_load_series("*FACEXDFR", PAL_MAP_ALL_TO_CLOSEST |
@@ -1047,7 +1046,6 @@ static void handle_animation_play_organ() {
 
 static void handle_animation_phantom_1() {
 	int phan_reset_frame;
-	/* int id; */
 
 
 
diff --git a/engines/mads/phantom/rooms/room505.cpp b/engines/mads/phantom/rooms/room505.cpp
index 0724d35a88b..bc5bf6e04b7 100644
--- a/engines/mads/phantom/rooms/room505.cpp
+++ b/engines/mads/phantom/rooms/room505.cpp
@@ -816,7 +816,6 @@ void room_505_daemon() {
 		local->they_parted = true;
 		local->anim_2_running = true;
 		local->anim_1_running = false;
-		/* player.commands_allowed = false; */
 		aa[2] = kernel_run_animation(kernel_name('b', 1), 0);
 		id = kernel_add_dynamic(words_Christine, words_walk_to, SYNTAX_SINGULAR_FEM, KERNEL_NONE,
 			0, 0, 0, 0);
diff --git a/engines/mads/phantom/sound/asound.cpp b/engines/mads/phantom/sound/asound.cpp
index d3dfd21d4dd..c439aaf02a8 100644
--- a/engines/mads/phantom/sound/asound.cpp
+++ b/engines/mads/phantom/sound/asound.cpp
@@ -1222,7 +1222,6 @@ vol_advance:
 				pSrc++;
 				ch->_patchAttenuation = *pSrc;
 				ch->_pSrc += 2;
-				//var_8 = 1;
 				goto dispatch;
 			}
 
@@ -1269,7 +1268,6 @@ vol_advance:
 				(void)getRandomNumber();
 				uint16 rnd = _randomSeed & 0x7FFF;
 				uint16 idx = (uint16)((int16)rnd % (int16)var_C);
-				//var_6 = idx;
 
 				uint8 chosen = *(base + idx);
 				uint8 target = *(base + var_C);


Commit: 21a1e909fad18f79e2f7871356d9213633b01ccd
    https://github.com/scummvm/scummvm/commit/21a1e909fad18f79e2f7871356d9213633b01ccd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-10T12:35:34+10:00

Commit Message:
MADS: Hook up conv_system_cleanup call

Changed paths:
    engines/mads/core/conv.cpp
    engines/mads/core/game.cpp


diff --git a/engines/mads/core/conv.cpp b/engines/mads/core/conv.cpp
index 543b6af931f..4de33456802 100644
--- a/engines/mads/core/conv.cpp
+++ b/engines/mads/core/conv.cpp
@@ -1179,6 +1179,7 @@ void conv_system_init() {
 
 void conv_system_cleanup() {
 	delete savedConv;
+	savedConv = nullptr;
 }
 
 
diff --git a/engines/mads/core/game.cpp b/engines/mads/core/game.cpp
index 10965625763..62c18b92496 100644
--- a/engines/mads/core/game.cpp
+++ b/engines/mads/core/game.cpp
@@ -1537,7 +1537,7 @@ void game_control() {
 
 	kernel_game_shutdown();
 
-	// pl conv_system_cleanup();
+	conv_system_cleanup();
 	mcga_reset();
 }
 


Commit: db653b5c9849f826a2a82f07a1ba2fea6fc68a6b
    https://github.com/scummvm/scummvm/commit/db653b5c9849f826a2a82f07a1ba2fea6fc68a6b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-10T12:35:34+10:00

Commit Message:
MADS: Fix sound_play call in kernel_process_animation

Changed paths:
    engines/mads/core/kernel.cpp


diff --git a/engines/mads/core/kernel.cpp b/engines/mads/core/kernel.cpp
index 7448ace2eb6..a4922624b5e 100644
--- a/engines/mads/core/kernel.cpp
+++ b/engines/mads/core/kernel.cpp
@@ -43,6 +43,7 @@
 #include "mads/core/keys.h"
 #include "mads/core/pack.h"
 #include "mads/core/room.h"
+#include "mads/core/sound.h"
 #include "mads/core/xms.h"
 #include "mads/core/tile.h"
 #include "mads/core/popup.h"
@@ -1658,8 +1659,8 @@ static void kernel_process_animation(int handle, int asynchronous) {
 	}
 
 	if (!asynchronous) {
-		if (kernel_anim[handle].anim->frame[kernel_anim[handle].frame].sound) {
-			// pl sound_play(kernel_anim[handle].anim->frame[kernel_anim[handle].frame].sound);
+		if (g_engine->getGameID() != GType_Forest && kernel_anim[handle].anim->frame[kernel_anim[handle].frame].sound) {
+			sound_play(kernel_anim[handle].anim->frame[kernel_anim[handle].frame].sound);
 		}
 
 		if ((kernel_anim[handle].anim->misc_peel_x != 0) || (kernel_anim[handle].anim->misc_peel_y != 0)) {

More information about the Scummvm-git-logs mailing list