[Scummvm-git-logs] scummvm master -> 19b800e96539facdd9b37180fb0e8ae13800e41d
sev-
noreply at scummvm.org
Wed Jul 29 18:17:19 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
bfade01754 MADS: Fix unused variables warnings
ebfb2bb133 MADS: Comment out unused stati variable
0ffe73e712 MADS: Fix singed/unsigned comparison warning
19b800e965 MADS: Remove extraneous parens
Commit: bfade01754836e026dc97e7113d1f10887088c8c
https://github.com/scummvm/scummvm/commit/bfade01754836e026dc97e7113d1f10887088c8c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-29T20:12:59+02:00
Commit Message:
MADS: Fix unused variables warnings
Changed paths:
engines/mads/animview/animview.cpp
engines/mads/core/dialog.cpp
engines/mads/core/game.cpp
engines/mads/core/sprite_0.cpp
engines/mads/forest/global.cpp
engines/mads/forest/main.cpp
engines/mads/nebular/extra.cpp
engines/mads/nebular/main.cpp
engines/mads/nebular/menus.cpp
engines/mads/nebular/rooms/room353.cpp
engines/mads/nebular/rooms/room354.cpp
diff --git a/engines/mads/animview/animview.cpp b/engines/mads/animview/animview.cpp
index cfa9ee37529..b0114558212 100644
--- a/engines/mads/animview/animview.cpp
+++ b/engines/mads/animview/animview.cpp
@@ -71,9 +71,9 @@ int concat_mode;
bool stop_music_at_end;
bool wait_for_music_at_end;
-static const byte FX_TIMES[16] = {
- 0, 110, 110, 64, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0
-};
+//static const byte FX_TIMES[16] = {
+// 0, 110, 110, 64, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0
+//};
static bool has_sound_file;
static char sound_file_name[80];
diff --git a/engines/mads/core/dialog.cpp b/engines/mads/core/dialog.cpp
index 02a658fb183..069ae4033dd 100644
--- a/engines/mads/core/dialog.cpp
+++ b/engines/mads/core/dialog.cpp
@@ -907,7 +907,7 @@ char *dialog_read_filename(DialogPtr dialog, ItemPtr item) {
* Updates the status of a dialog box based on its status flag
*
* @param dialog Dialog
- * @param item
+ * @param item
*/
static void dialog_update_checkbox(DialogPtr dialog, ItemPtr item) {
char temp1[2];
@@ -3183,6 +3183,8 @@ int dialog_alert(int x, int y, int buttons, const char *string1,
returnval = dialog_error;
}
+ (void)num_strings;
+
return returnval;
}
diff --git a/engines/mads/core/game.cpp b/engines/mads/core/game.cpp
index 6841bac0fbd..01a3d81fb32 100644
--- a/engines/mads/core/game.cpp
+++ b/engines/mads/core/game.cpp
@@ -309,6 +309,7 @@ void flag_parse(const char **myscan) {
case 'M':
if (scan_past(myscan, ':')) {
mem_max = atol(*myscan);
+ (void)mem_max;
scan_past(myscan, 0);
}
break;
diff --git a/engines/mads/core/sprite_0.cpp b/engines/mads/core/sprite_0.cpp
index 85267f2dd63..b1b535b75be 100644
--- a/engines/mads/core/sprite_0.cpp
+++ b/engines/mads/core/sprite_0.cpp
@@ -1125,6 +1125,8 @@ row_finish:
}
} /* end while(1) row_loop */
+
+ (void)pixel_ptr; /* suppress unused variable warning */
}
all_done:;
diff --git a/engines/mads/forest/global.cpp b/engines/mads/forest/global.cpp
index 2e4de9d1a1f..ee37e872615 100644
--- a/engines/mads/forest/global.cpp
+++ b/engines/mads/forest/global.cpp
@@ -1196,9 +1196,9 @@ 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];
+ //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 32a8de13cb9..6a525b9f1ff 100644
--- a/engines/mads/forest/main.cpp
+++ b/engines/mads/forest/main.cpp
@@ -44,8 +44,8 @@
namespace MADS {
namespace Forest {
-constexpr bool SHOW_LINES = true;
-constexpr byte LINE_COLOR = 2;
+//constexpr bool SHOW_LINES = true;
+//constexpr byte LINE_COLOR = 2;
char *quotes;
diff --git a/engines/mads/nebular/extra.cpp b/engines/mads/nebular/extra.cpp
index 833a183e1f7..d35c7828ba2 100644
--- a/engines/mads/nebular/extra.cpp
+++ b/engines/mads/nebular/extra.cpp
@@ -319,7 +319,7 @@ RoomPtr room_load(int id, int variant, const char *base_path, Buffer *picture,
char base[80];
char block_name[20];
bool sceneFlag = id >= 0;
- int width, height, picSize;
+ int width, height;
SeriesPtr sprites[10] = { nullptr };
int16 spritesHandles[10] = { -1 };
@@ -380,7 +380,7 @@ RoomPtr room_load(int id, int variant, const char *base_path, Buffer *picture,
width = roomfile.xs;
height = roomfile.ys;
- picSize = width * height;
+ //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 25c6a5b9932..f7e394c1d61 100644
--- a/engines/mads/nebular/main.cpp
+++ b/engines/mads/nebular/main.cpp
@@ -51,7 +51,7 @@
namespace MADS {
namespace RexNebular {
-constexpr bool SHOW_LINES = true;
+//constexpr bool SHOW_LINES = true;
constexpr byte LINE_COLOR = 2;
char *quotes;
diff --git a/engines/mads/nebular/menus.cpp b/engines/mads/nebular/menus.cpp
index c10e2b5acdd..ba8f475a22d 100644
--- a/engines/mads/nebular/menus.cpp
+++ b/engines/mads/nebular/menus.cpp
@@ -151,7 +151,7 @@ static void game_menu_setup() {
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 0);
-
+
cursor_id = MAX(CURSOR_WAIT, cursor->num_sprites);
if (cursor_id != cursor_last) {
mouse_cursor_sprite(cursor, cursor_id);
@@ -849,13 +849,13 @@ static int game_menu_sprite(int sprite, int depth) {
static void game_menu_main() {
int going = true;
int first_time = true;
- int frame_id;
+ //int frame_id;
long menu_clock = 0;
long now_clock;
game_menu_first_init();
- frame_id = game_menu_sprite(1, 2);
+ //frame_id = game_menu_sprite(1, 2);
while (kernel.activate_menu == GAME_MAIN_MENU) {
@@ -940,7 +940,7 @@ static void game_menu_main() {
static void game_menu_options() {
int going = true;
int first_time = true;
- int frame_id;
+ //int frame_id;
long menu_clock = 0;
long now_clock;
ConfigFile save_config;
@@ -949,7 +949,7 @@ static void game_menu_options() {
game_menu_first_init();
- frame_id = game_menu_sprite(2, 2);
+ //frame_id = game_menu_sprite(2, 2);
while (kernel.activate_menu == GAME_OPTIONS_MENU) {
going = true;
@@ -1212,7 +1212,7 @@ static int game_menu_save_keyboard(int going) {
static void game_menu_save() {
int going = true;
int first_time = true;
- int frame_id;
+ //int frame_id;
int id;
int special_sprite;
int let_scroll_continue;
@@ -1233,7 +1233,7 @@ static void game_menu_save() {
game_menu_first_init();
- frame_id = game_menu_sprite(3, 2);
+ //frame_id = game_menu_sprite(3, 2);
game_menu_save_dirty = false;
@@ -1410,7 +1410,7 @@ static int game_menu_restore_keyboard(int going) {
static void game_menu_restore() {
int going = true;
int first_time = true;
- int frame_id;
+ //int frame_id;
int id;
int special_sprite;
int let_scroll_continue;
@@ -1429,7 +1429,7 @@ static void game_menu_restore() {
game_menu_first_init();
- frame_id = game_menu_sprite(3, 2);
+ //frame_id = game_menu_sprite(3, 2);
while (kernel.activate_menu == GAME_RESTORE_MENU) {
@@ -1574,13 +1574,13 @@ static void game_menu_restore() {
static void game_menu_difficulty() {
int going = true;
int first_time = true;
- int frame_id;
+ //int frame_id;
long menu_clock = 0;
long now_clock;
game_menu_first_init();
- frame_id = game_menu_sprite(8, 2);
+ //frame_id = game_menu_sprite(8, 2);
while (kernel.activate_menu == GAME_DIFFICULTY_MENU) {
@@ -1663,13 +1663,13 @@ static void game_menu_difficulty() {
static void game_menu_alert() {
int going = true;
int first_time = true;
- int frame_id;
+ //int frame_id;
long menu_clock = 0;
long now_clock;
game_menu_first_init();
- frame_id = game_menu_sprite(9, 2);
+ //frame_id = game_menu_sprite(9, 2);
while (kernel.activate_menu == GAME_ALERT_MENU) {
diff --git a/engines/mads/nebular/rooms/room353.cpp b/engines/mads/nebular/rooms/room353.cpp
index 946b444fe79..8ac8223c866 100644
--- a/engines/mads/nebular/rooms/room353.cpp
+++ b/engines/mads/nebular/rooms/room353.cpp
@@ -34,7 +34,7 @@ struct Scratch {
};
-static Scratch local;
+//static Scratch local;
static void room_353_init() {
diff --git a/engines/mads/nebular/rooms/room354.cpp b/engines/mads/nebular/rooms/room354.cpp
index 7e4fa57c265..6da91edb537 100644
--- a/engines/mads/nebular/rooms/room354.cpp
+++ b/engines/mads/nebular/rooms/room354.cpp
@@ -34,7 +34,7 @@ struct Scratch {
};
-static Scratch local;
+//static Scratch local;
static void room_354_init() {
global[kAfterHavoc] = true;
Commit: ebfb2bb133d03118c517e479235e7447a0235b2e
https://github.com/scummvm/scummvm/commit/ebfb2bb133d03118c517e479235e7447a0235b2e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-29T20:13:28+02:00
Commit Message:
MADS: Comment out unused stati variable
Changed paths:
engines/mads/core/vocab.cpp
diff --git a/engines/mads/core/vocab.cpp b/engines/mads/core/vocab.cpp
index 40f928e5de2..dee201a1a2f 100644
--- a/engines/mads/core/vocab.cpp
+++ b/engines/mads/core/vocab.cpp
@@ -434,6 +434,7 @@ void vocab_sort() {
}
}
+/*
static bool check_for_caps(const char *string) {
bool any_caps = false;
const char *mark;
@@ -444,6 +445,7 @@ static bool check_for_caps(const char *string) {
return any_caps;
}
+*/
void vocab_unload_active() {
vocab_size = 0;
Commit: 0ffe73e712fd29c78593a37512604d7e819388b1
https://github.com/scummvm/scummvm/commit/0ffe73e712fd29c78593a37512604d7e819388b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-29T20:14:51+02:00
Commit Message:
MADS: Fix singed/unsigned comparison warning
Changed paths:
engines/mads/nebular/copy.cpp
diff --git a/engines/mads/nebular/copy.cpp b/engines/mads/nebular/copy.cpp
index 8a093d9f086..afc42bfd1f1 100644
--- a/engines/mads/nebular/copy.cpp
+++ b/engines/mads/nebular/copy.cpp
@@ -55,12 +55,11 @@ struct CopyProt {
static void copy_mangle(byte copy_prot[CopyProt::SIZE]) {
- int count;
byte *dog;
dog = (byte *)copy_prot;
- for (count = 0; count < CopyProt::SIZE; count++) {
+ for (uint count = 0; count < CopyProt::SIZE; count++) {
*dog ^= 0xff;
dog++;
}
Commit: 19b800e96539facdd9b37180fb0e8ae13800e41d
https://github.com/scummvm/scummvm/commit/19b800e96539facdd9b37180fb0e8ae13800e41d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-29T20:16:54+02:00
Commit Message:
MADS: Remove extraneous parens
Changed paths:
engines/mads/nebular/rooms/room202.cpp
diff --git a/engines/mads/nebular/rooms/room202.cpp b/engines/mads/nebular/rooms/room202.cpp
index 1c2d5abc462..f9a526ff4c7 100644
--- a/engines/mads/nebular/rooms/room202.cpp
+++ b/engines/mads/nebular/rooms/room202.cpp
@@ -337,7 +337,7 @@ static void room_202_daemon() {
}
}
- if ((kernel_anim[0].anim == nullptr))
+ if (kernel_anim[0].anim == nullptr)
return;
if (local._waitingMeteoFl) {
@@ -628,7 +628,7 @@ static void room_202_parser() {
}
break;
case 2:
- if ((kernel_anim[0].anim == nullptr))
+ if (kernel_anim[0].anim == nullptr)
text_show(20222);
local._meteorologistSpecial = false;
kernel_seq_delete(g_sequence_ids[10]);
More information about the Scummvm-git-logs
mailing list