Unverified Commit fa71a164 authored by Libretro-Admin's avatar Libretro-Admin Committed by GitHub
Browse files

Merge pull request #16 from vladikcomper/main

Fix Plane B scrolling bug
parents 1797b6b0 12755667
Pipeline #120596 passed with stages
in 24 minutes and 43 seconds
...@@ -1529,9 +1529,9 @@ void render_bg_m5(int line) ...@@ -1529,9 +1529,9 @@ void render_bg_m5(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
yscroll = *(uint32 *)&vsram[0]; yscroll = *(uint32 *)&vsram[0];
...@@ -1704,9 +1704,9 @@ void render_bg_m5_vs(int line) ...@@ -1704,9 +1704,9 @@ void render_bg_m5_vs(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
...@@ -1921,9 +1921,9 @@ void render_bg_m5_im2(int line) ...@@ -1921,9 +1921,9 @@ void render_bg_m5_im2(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
yscroll = *(uint32 *)&vsram[0]; yscroll = *(uint32 *)&vsram[0];
...@@ -2095,9 +2095,9 @@ void render_bg_m5_im2_vs(int line) ...@@ -2095,9 +2095,9 @@ void render_bg_m5_im2_vs(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
pf_col_mask = playfield_col_mask; pf_col_mask = playfield_col_mask;
...@@ -2308,9 +2308,9 @@ void render_bg_m5(int line) ...@@ -2308,9 +2308,9 @@ void render_bg_m5(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
uint32 yscroll = *(uint32 *)&vsram[0]; uint32 yscroll = *(uint32 *)&vsram[0];
...@@ -2483,9 +2483,9 @@ void render_bg_m5_vs(int line) ...@@ -2483,9 +2483,9 @@ void render_bg_m5_vs(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
uint32 yscroll = 0; uint32 yscroll = 0;
...@@ -2700,9 +2700,9 @@ void render_bg_m5_im2(int line) ...@@ -2700,9 +2700,9 @@ void render_bg_m5_im2(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
uint32 yscroll = *(uint32 *)&vsram[0]; uint32 yscroll = *(uint32 *)&vsram[0];
...@@ -2876,9 +2876,9 @@ void render_bg_m5_im2_vs(int line) ...@@ -2876,9 +2876,9 @@ void render_bg_m5_im2_vs(int line)
(render_obj == render_obj_m5_im2_ste) || (render_obj == render_obj_m5_im2_ste) ||
(render_obj == render_obj_m5_ste) (render_obj == render_obj_m5_ste)
) { ) {
xscroll += ( xscroll = (
(config.h40_extra_columns * 4) + ((xscroll + config.h40_extra_columns * 4) & 0xFFFF) +
((config.h40_extra_columns * 4) << 16) ((xscroll + ((config.h40_extra_columns * 4) << 16)) & 0xFFFF0000)
); );
} }
uint32 yscroll = 0; uint32 yscroll = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment