[Scummvm-git-logs] scummvm master -> 082d94ff30ac8041e845ace2f3b77156fdfc68bf

[dreammaster]

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:
94e661104b MADS: NEBULAR: Fix ConfMan start_intro flag to start the intro
1c34efb863 MADS: NEBULAR: Fix overshadowed global warning in Mac code
082d94ff30 MADS: NEBULAR: Further ship sprite rendering fixes in intro


Commit: 94e661104b157cb286d5bc2369048212551e4e09
    https://github.com/scummvm/scummvm/commit/94e661104b157cb286d5bc2369048212551e4e09
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-09T12:57:00+10:00

Commit Message:
MADS: NEBULAR: Fix ConfMan start_intro flag to start the intro

Changed paths:
    engines/mads/nebular/main.cpp


diff --git a/engines/mads/nebular/main.cpp b/engines/mads/nebular/main.cpp
index a0822e131aa..0fb67e00b1f 100644
--- a/engines/mads/nebular/main.cpp
+++ b/engines/mads/nebular/main.cpp
@@ -327,7 +327,7 @@ void nebular_main() {
 	else if (g_engine->isDemo())
 		selected_item = 9;
 	else if (ConfMan.getBool("start_intro"))
-		selected_item = 3;
+		selected_item = 2;
 	else
 		selected_item = -1;
 


Commit: 1c34efb863ecf4d234545f04c6eed9ea801acf48
    https://github.com/scummvm/scummvm/commit/1c34efb863ecf4d234545f04c6eed9ea801acf48
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-09T12:57:00+10:00

Commit Message:
MADS: NEBULAR: Fix overshadowed global warning in Mac code

Changed paths:
    engines/mads/nebular/mac_resources.cpp
    engines/mads/nebular/mac_resources.h


diff --git a/engines/mads/nebular/mac_resources.cpp b/engines/mads/nebular/mac_resources.cpp
index 3cff373d887..35b0e47a2d1 100644
--- a/engines/mads/nebular/mac_resources.cpp
+++ b/engines/mads/nebular/mac_resources.cpp
@@ -636,11 +636,11 @@ Common::SeekableReadStream *MacResourceProvider::openText(int32 id, uint16 &unpa
 	return stream;
 }
 
-Common::SeekableReadStream *MacResourceProvider::openSound(int section, int command) {
-	if (section < 1 || section > 9 || command < 0 || command >= 1000)
+Common::SeekableReadStream *MacResourceProvider::openSound(int section, int commandId) {
+	if (section < 1 || section > 9 || commandId < 0 || commandId >= 1000)
 		return nullptr;
 	return _containers[kSoundContainer]->getResource(MKTAG('s', 'n', 'd', ' '),
-		section * 1000 + command);
+		section * 1000 + commandId);
 }
 
 } // namespace RexNebular
diff --git a/engines/mads/nebular/mac_resources.h b/engines/mads/nebular/mac_resources.h
index 15730e034b9..e2fc58930de 100644
--- a/engines/mads/nebular/mac_resources.h
+++ b/engines/mads/nebular/mac_resources.h
@@ -72,7 +72,7 @@ public:
 	bool exists(const char *filename) override;
 	bool allowsFallback(const char *filename) const override;
 	Common::SeekableReadStream *openText(int32 id, uint16 &unpackedSize) override;
-	Common::SeekableReadStream *openSound(int section, int command);
+	Common::SeekableReadStream *openSound(int section, int commandId);
 	int getCursorCount() const override { return 6; }
 	bool setCursor(int id) override;
 	void updateCursor() override;


Commit: 082d94ff30ac8041e845ace2f3b77156fdfc68bf
    https://github.com/scummvm/scummvm/commit/082d94ff30ac8041e845ace2f3b77156fdfc68bf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-09T12:57:01+10:00

Commit Message:
MADS: NEBULAR: Further ship sprite rendering fixes in intro

Changed paths:
    engines/mads/core/matte.cpp
    engines/mads/core/sprite_0.cpp


diff --git a/engines/mads/core/matte.cpp b/engines/mads/core/matte.cpp
index 3dc6104a2fc..9069d78d298 100644
--- a/engines/mads/core/matte.cpp
+++ b/engines/mads/core/matte.cpp
@@ -840,7 +840,7 @@ void matte_frame(int special_effect, int full_screen) {
 					image_list[id2].sprite_id,
 					&scr_work, &scr_depth,
 					x, y,
-					image_list[id2].depth,
+					(int8)image_list[id2].depth,
 					picture_map.pan_offset_x,
 					picture_map.pan_offset_y);
 			}
@@ -850,7 +850,7 @@ void matte_frame(int special_effect, int full_screen) {
 				&scr_work, &scr_depth,
 				image_list[id2].x - picture_map.pan_x,
 				image_list[id2].y - picture_map.pan_y,
-				image_list[id2].depth,
+				(int8)image_list[id2].depth,
 				image_list[id2].scale,
 				picture_map.pan_offset_x,
 				picture_map.pan_offset_y);
diff --git a/engines/mads/core/sprite_0.cpp b/engines/mads/core/sprite_0.cpp
index b1b535b75be..260e1289797 100644
--- a/engines/mads/core/sprite_0.cpp
+++ b/engines/mads/core/sprite_0.cpp
@@ -378,7 +378,7 @@ ys = sprite->ys;
 	skip_x = abs_skip_x;
 
 #if three_d
-	byte draw_depth = (byte)target_depth;
+	int8 draw_depth = (int8)target_depth;
 #endif
 
 #if bresenham
@@ -551,7 +551,7 @@ pixel_DUMP_no_attr:;
 #endif
 
 							if (depth_code == 0)                   goto pixel_DUMP_skip_n_pop;
-							if ((byte)draw_depth > depth_code)     goto pixel_DUMP_skip_n_pop;
+							if (draw_depth > depth_code)     goto pixel_DUMP_skip_n_pop;
 						}
 #endif /* three_d */
 
@@ -715,7 +715,7 @@ pixel_RLE_no_attr:;
 #endif
 
 								if (depth_code == 0)               goto pixel_RLE_run_skip_n_pop;
-								if ((byte)draw_depth > depth_code) goto pixel_RLE_run_skip_n_pop;
+								if (draw_depth > depth_code) goto pixel_RLE_run_skip_n_pop;
 							}
 #endif /* three_d */
 
@@ -886,7 +886,7 @@ pixel_IRLE_run_no_attr:;
 #endif
 
 								if (depth_code == 0)               goto pixel_IRLE_run_skip_n_pop;
-								if ((byte)draw_depth > depth_code) goto pixel_IRLE_run_skip_n_pop;
+								if (draw_depth > depth_code) goto pixel_IRLE_run_skip_n_pop;
 							}
 #endif /* three_d */
 
@@ -1027,7 +1027,7 @@ pixel_IRLE_image_no_attr:;
 #endif
 
 							if (depth_code == 0)               goto pixel_IRLE_image_skip_n_pop;
-							if ((byte)draw_depth > depth_code) goto pixel_IRLE_image_skip_n_pop;
+							if (draw_depth > depth_code) goto pixel_IRLE_image_skip_n_pop;
 						}
 #endif /* three_d */