Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

this fixes fast forwarding but probably has to change to a proper fix

Browse Source
This commit is contained in:
radius 2017-04-24 21:25:08 -05:00
parent 3dffa3a0ca
commit 765a072c73
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/timing.c
View File

@ -59,7 +59,9 @@ void GB_timing_sync(GB_gameboy_t *gb)
uint64_t target_nanoseconds = gb->cycles_since_last_sync * FRAME_LENGTH / LCDC_PERIOD; uint64_t target_nanoseconds = gb->cycles_since_last_sync * FRAME_LENGTH / LCDC_PERIOD;
int64_t nanoseconds = get_nanoseconds(); int64_t nanoseconds = get_nanoseconds();
if (labs((signed long)(nanoseconds - gb->last_sync)) < target_nanoseconds ) { if (labs((signed long)(nanoseconds - gb->last_sync)) < target_nanoseconds ) {
#ifndef __LIBRETRO__
nsleep(target_nanoseconds + gb->last_sync - nanoseconds); nsleep(target_nanoseconds + gb->last_sync - nanoseconds);
#endif
gb->last_sync += target_nanoseconds; gb->last_sync += target_nanoseconds;
} }
else { else {

23
libretro/libretro.c
View File

@ -43,7 +43,8 @@ static retro_input_state_t input_state_cb;
signed short soundbuf[1024*2]; signed short soundbuf[1024*2];
char retro_base_directory[4096]; char retro_system_directory[4096];
char retro_save_directory[4096];
char retro_game_path[4096]; char retro_game_path[4096];
int RLOOP=1; int RLOOP=1;
@ -131,10 +132,14 @@ void retro_init(void)
const char *dir = NULL; const char *dir = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
{ snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", dir);
snprintf(retro_base_directory, sizeof(retro_base_directory), "%s/sameboy", dir); else
} snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", ".");
else snprintf(retro_base_directory, sizeof(retro_base_directory), "%s", ".");
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", dir);
else
snprintf(retro_system_directory, sizeof(retro_system_directory), "%s", ".");
} }
void retro_deinit(void) void retro_deinit(void)
@ -272,7 +277,8 @@ bool retro_load_game(const struct retro_game_info *info)
if (!strstr(info->path, "gbc")) if (!strstr(info->path, "gbc"))
{ {
GB_init(&gb); GB_init(&gb);
snprintf(buf, sizeof(buf), "%s%cdmg_boot.bin", retro_base_directory, slash); snprintf(buf, sizeof(buf), "%s%cdmg_boot.bin", retro_system_directory, slash);
log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf);
err = GB_load_boot_rom(&gb, buf); err = GB_load_boot_rom(&gb, buf);
if (err) if (err)
@ -281,7 +287,8 @@ bool retro_load_game(const struct retro_game_info *info)
else else
{ {
GB_init_cgb(&gb); GB_init_cgb(&gb);
snprintf(buf, sizeof(buf), "%s%ccgb_boot.bin", retro_base_directory, slash); snprintf(buf, sizeof(buf), "%s%ccgb_boot.bin", retro_system_directory, slash);
log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf);
err = GB_load_boot_rom(&gb, buf); err = GB_load_boot_rom(&gb, buf);
if (err) if (err)
@ -310,7 +317,7 @@ bool retro_load_game(const struct retro_game_info *info)
printf("(%s)\n",battery_save_path); printf("(%s)\n",battery_save_path);
/* Configure symbols */ /* Configure symbols */
sprintf(TMPC,"%s/registers.sym",retro_base_directory); sprintf(TMPC,"%s/registers.sym",retro_system_directory);
GB_debugger_load_symbol_file(&gb, TMPC); GB_debugger_load_symbol_file(&gb, TMPC);
replace_extension(retro_game_path, path_length, symbols_path, ".sym"); replace_extension(retro_game_path, path_length, symbols_path, ".sym");