RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui, fix for gfx save/load menu bg (menubg_src != screen)

Browse source
This commit is contained in:
kub 2021-01-20 19:41:14 +01:00
parent 43f79c5b41
commit 4e0fca8142
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
platform/common/menu_pico.c
View file

@ -82,7 +82,7 @@ static const char *men_dummy[] = { NULL };
#define MENU_OPTIONS_ADV #define MENU_OPTIONS_ADV
#endif #endif
static void make_bg(int no_scale) static void make_bg(int no_scale, int from_screen)
{ {
unsigned short *src = (void *)g_menubg_src_ptr; unsigned short *src = (void *)g_menubg_src_ptr;
int w = g_menubg_src_w ? g_menubg_src_w : g_screen_width; int w = g_menubg_src_w ? g_menubg_src_w : g_screen_width;
@ -91,6 +91,13 @@ static void make_bg(int no_scale)
short *dst; short *dst;
int x, y; int x, y;
if (from_screen) {
src = g_screen_ptr;
w = g_screen_width;
h = g_screen_height;
pp = g_screen_ppitch;
}
if (src == NULL) { if (src == NULL) {
memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
return; return;
@ -144,7 +151,7 @@ static void menu_enter(int is_rom_loaded)
{ {
if (is_rom_loaded) if (is_rom_loaded)
{ {
make_bg(0); make_bg(0, 0);
} }
else else
{ {
@ -178,7 +185,7 @@ static void draw_savestate_bg(int slot)
/* do a frame and fetch menu bg */ /* do a frame and fetch menu bg */
pemu_forced_frame(0, 0); pemu_forced_frame(0, 0);
make_bg(0); make_bg(0, 1);
PicoTmpStateRestore(tmp_state); PicoTmpStateRestore(tmp_state);
} }
@ -852,7 +859,7 @@ static void draw_frame_debug(void)
if (!(pv->debug_p & PVD_KILL_32X)) memcpy(layer_str + 26, "32x", 4); if (!(pv->debug_p & PVD_KILL_32X)) memcpy(layer_str + 26, "32x", 4);
pemu_forced_frame(1, 0); pemu_forced_frame(1, 0);
make_bg(1); make_bg(1, 1);
smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff); smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff);
smalltext_out16(4, g_menuscreen_h - me_sfont_h, layer_str, 0xffff); smalltext_out16(4, g_menuscreen_h - me_sfont_h, layer_str, 0xffff);
@ -882,7 +889,7 @@ static void debug_menu_loop(void)
case 1: draw_frame_debug(); case 1: draw_frame_debug();
break; break;
case 2: pemu_forced_frame(1, 0); case 2: pemu_forced_frame(1, 0);
make_bg(1); make_bg(1, 1);
PDebugShowSpriteStats((unsigned short *)g_menuscreen_ptr PDebugShowSpriteStats((unsigned short *)g_menuscreen_ptr
+ (g_menuscreen_h/2 - 240/2) * g_menuscreen_pp + (g_menuscreen_h/2 - 240/2) * g_menuscreen_pp
+ g_menuscreen_w/2 - 320/2, g_menuscreen_pp); + g_menuscreen_w/2 - 320/2, g_menuscreen_pp);