X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=6a8c940b22726e2a2cfb8df81fb1025a52f5bba4;hb=9db6a54485501b56b0f2f5db4d093c38fe495bda;hp=88fefd57ca91f34e0a1bb6bbf32e5da80d9a6a9a;hpb=868cc0cc8f2fc6cfd278b15e8dbd042188de53ca;p=picodrive.git diff --git a/platform/common/emu.c b/platform/common/emu.c index 88fefd5..6a8c940 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -738,8 +738,26 @@ mk_text_out(emu_text_out16_rot, unsigned short, 0xffff, #undef mk_text_out +void emu_osd_text16(int x, int y, const char *text) +{ + int len = strlen(text) * 8; + int i, h; + + len++; + if (x + len > g_screen_width) + len = g_screen_width - x; + + for (h = 0; h < 8; h++) { + unsigned short *p; + p = (unsigned short *)g_screen_ptr + + x + g_screen_width * (y + h); + for (i = len; i > 0; i--, p++) + *p = (*p >> 2) & 0x39e7; + } + emu_text_out16(x, y, text); +} -void update_movie(void) +static void update_movie(void) { int offs = Pico.m.frame_count*3 + 0x40; if (offs+3 > movie_size) { @@ -955,6 +973,9 @@ void emu_set_fastforward(int set_on) currentConfig.EmuOpt = set_EmuOpt; PsndRerate(1); is_on = 0; + // mainly to unbreak pcm + if (PicoAHW & PAHW_MCD) + pcd_state_loaded(); } } @@ -1120,6 +1141,8 @@ static void run_events_ui(unsigned int which) emu_status_msg("SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot, NULL) ? "USED" : "FREE"); } + if (which & PEV_RESET) + emu_reset_game(); if (which & PEV_MENU) engineState = PGS_Menu; } @@ -1409,7 +1432,7 @@ void emu_loop(void) printf("%s\n", fpsbuff); #else if (currentConfig.EmuOpt & EOPT_SHOW_FPS) - sprintf(fpsbuff, "%02i/%02i ", frames_shown, frames_done); + snprintf(fpsbuff, 8, "%02i/%02i ", frames_shown, frames_done); #endif frames_shown = frames_done = 0; timestamp_fps_x3 += ms_to_ticks(1000) * 3;