[Scummvm-git-logs] scummvm master -> 4ffb3a52714e0163dbceadc30dcef9c1b8d282b3
dreammaster
noreply at scummvm.org
Sun Aug 9 03:45:14 UTC 2026
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:
e30514407d MADS: DRAGONSPHERE: Remove unused local
4ffb3a5271 MADS: Change magic functions to pass palettes by reference
Commit: e30514407d09bf6d5481bae12ef23cbf8733d6c8
https://github.com/scummvm/scummvm/commit/e30514407d09bf6d5481bae12ef23cbf8733d6c8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-09T13:14:57+10:00
Commit Message:
MADS: DRAGONSPHERE: Remove unused local
Changed paths:
engines/mads/dragonsphere/rooms/room506.cpp
diff --git a/engines/mads/dragonsphere/rooms/room506.cpp b/engines/mads/dragonsphere/rooms/room506.cpp
index 83631836304..efb852189fd 100644
--- a/engines/mads/dragonsphere/rooms/room506.cpp
+++ b/engines/mads/dragonsphere/rooms/room506.cpp
@@ -103,7 +103,6 @@ static Scratch scratch;
static void handle_animation_pid() {
int pid_reset_frame;
- int random;
if (kernel_anim[aa[0]].frame != local->pid_frame) {
local->pid_frame = kernel_anim[aa[0]].frame;
Commit: 4ffb3a52714e0163dbceadc30dcef9c1b8d282b3
https://github.com/scummvm/scummvm/commit/4ffb3a52714e0163dbceadc30dcef9c1b8d282b3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-09T13:44:55+10:00
Commit Message:
MADS: Change magic functions to pass palettes by reference
Changed paths:
engines/mads/core/magic.cpp
engines/mads/core/magic.h
diff --git a/engines/mads/core/magic.cpp b/engines/mads/core/magic.cpp
index ddd918e9dbd..7d3e63757f7 100644
--- a/engines/mads/core/magic.cpp
+++ b/engines/mads/core/magic.cpp
@@ -179,7 +179,7 @@ void magic_map_to_grey_ramp(Palette *pal,
}
}
-void magic_grey_ramp_palette(Palette pal, int num_greys) {
+void magic_grey_ramp_palette(Palette &pal, int num_greys) {
int base_grey;
int base_color, num_colors;
int count;
@@ -196,7 +196,7 @@ void magic_grey_ramp_palette(Palette pal, int num_greys) {
}
}
-void magic_fade_to_grey(Palette pal, byte *map_pointer,
+void magic_fade_to_grey(Palette &pal, byte *map_pointer,
int base_color, int num_colors,
int base_grey, int num_greys,
int tick_delay, int steps) {
@@ -382,7 +382,7 @@ done:
}
}
-void magic_screen_change_corner(Buffer *new_screen, Palette pal,
+void magic_screen_change_corner(Buffer *new_screen, Palette &pal,
int corner_id,
int buffer_base_x, int buffer_base_y,
int screen_base_x, int screen_base_y,
@@ -435,11 +435,6 @@ void magic_screen_change_corner(Buffer *new_screen, Palette pal,
delta_x = (start_x ? -1 : 1);
delta_y = (start_y ? -1 : 1);
- if (video_mode != mcga_mode) {
- thru_black = false;
- set_palette = false;
- }
-
loop_start = (thru_black == MAGIC_THRU_BLACK) ? 0 : 1;
if (set_palette && !thru_black) {
@@ -525,7 +520,7 @@ void magic_screen_change_corner(Buffer *new_screen, Palette pal,
mouse_show();
}
-void magic_screen_change_edge(Buffer *new_screen, Palette pal,
+void magic_screen_change_edge(Buffer *new_screen, Palette &pal,
int edge_id,
int buffer_base_x, int buffer_base_y,
int screen_base_x, int screen_base_y,
@@ -554,11 +549,6 @@ void magic_screen_change_edge(Buffer *new_screen, Palette pal,
delta_x = (start_x ? -1 : 1);
- if (video_mode != mcga_mode) {
- thru_black = false;
- set_palette = false;
- }
-
loop_start = (thru_black == MAGIC_THRU_BLACK) ? 0 : 1;
if (set_palette && !thru_black) {
@@ -622,7 +612,7 @@ void magic_screen_change_edge(Buffer *new_screen, Palette pal,
mouse_show();
}
-void magic_screen_change_circle(Buffer *new_screen, Palette pal,
+void magic_screen_change_circle(Buffer *new_screen, Palette &pal,
int inward_flag,
int buffer_base_x, int buffer_base_y,
int screen_base_x, int screen_base_y,
@@ -673,11 +663,6 @@ void magic_screen_change_circle(Buffer *new_screen, Palette pal,
delta_radius = pixel_rate;
}
- if (video_mode != mcga_mode) {
- thru_black = false;
- set_palette = false;
- }
-
loop_start = (thru_black == MAGIC_THRU_BLACK) ? 0 : 1;
if (set_palette && !thru_black) {
diff --git a/engines/mads/core/magic.h b/engines/mads/core/magic.h
index e740f1e0cde..5d5ddf93726 100644
--- a/engines/mads/core/magic.h
+++ b/engines/mads/core/magic.h
@@ -75,8 +75,8 @@ extern void magic_set_color_flags(byte r, byte g, byte b);
extern void magic_set_color_values(byte r, byte g, byte b);
extern void magic_map_to_grey_ramp(Palette *pal, int base_color, int num_colors,
int base_grey, int num_greys, MagicGreyPtr magic_map);
-extern void magic_grey_ramp_palette(Palette pal, int num_greys);
-extern void magic_fade_to_grey(Palette pal, byte *map_pointer,
+extern void magic_grey_ramp_palette(Palette &pal, int num_greys);
+extern void magic_fade_to_grey(Palette &pal, byte *map_pointer,
int base_color, int num_colors, int base_grey, int num_greys,
int tick_delay, int steps);
extern void magic_fade_from_grey(RGBcolor *pal, Palette target, int base_color,
@@ -98,7 +98,7 @@ extern void magic_fade_from_grey(RGBcolor *pal, Palette target, int base_color,
* @param set_palette
* @param tick_delay
*/
-extern void magic_screen_change_corner(Buffer *new_screen, Palette pal, int corner_id,
+extern void magic_screen_change_corner(Buffer *new_screen, Palette &pal, int corner_id,
int buffer_base_x, int buffer_base_y, int screen_base_x, int screen_base_y,
int thru_black, int set_palette, int tick_delay);
@@ -117,7 +117,7 @@ extern void magic_screen_change_corner(Buffer *new_screen, Palette pal, int corn
* @param set_palette
* @param tick_delay
*/
-extern void magic_screen_change_edge(Buffer *new_screen, Palette pal, int edge_id,
+extern void magic_screen_change_edge(Buffer *new_screen, Palette &pal, int edge_id,
int buffer_base_x, int buffer_base_y, int screen_base_x, int screen_base_y,
int thru_black, int set_palette, int tick_delay);
@@ -138,7 +138,7 @@ extern void magic_screen_change_edge(Buffer *new_screen, Palette pal, int edge_i
* @param tick_delay
* @param pixel_rate
*/
-extern void magic_screen_change_circle(Buffer *new_screen, Palette pal,
+extern void magic_screen_change_circle(Buffer *new_screen, Palette &pal,
int inward_flag, int buffer_base_x, int buffer_base_y,
int screen_base_x, int screen_base_y, int thru_black, int set_palette,
int tick_delay, int pixel_rate);
@@ -146,7 +146,7 @@ extern void magic_shrink_buffer(Buffer *from, Buffer *unto);
extern int magic_shrinking_buffer(Buffer *source, Buffer *rear, int grow_flag,
int buffer_base_x, int buffer_base_y, int screen_base_x, int screen_base_y,
int tick_delay);
-extern void magic_swap_me_in_the_dark_baby(byte *swap, Palette pal, int start);
+extern void magic_swap_me_in_the_dark_baby(byte *swap, Palette &pal, int start);
extern void magic_swap_foreground(byte *background_table, Palette background_palette);
/**
More information about the Scummvm-git-logs
mailing list