admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex
2015-08-28 12:22:54 +02:00
parent 667aa635af
commit 070c31c08d
1 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/drivers/libretro/libretro.c
View File

@@ -532,13 +532,7 @@ void retro_init(void)
#endif #endif
} }
static void emulator_set_input(void) static void retro_set_custom_palette (void)
{
FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn[0], 0);
FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn[0], 0);
}
static void emulator_set_custom_palette (void)
{ {
uint8_t i,r,g,b; uint8_t i,r,g,b;
@@ -577,29 +571,6 @@ static void emulator_set_custom_palette (void)
} }
} }
static bool fceu_init(const struct retro_game_info *game)
{
char* dir=NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
FCEUI_SetBaseDirectory(dir);
FCEUI_Initialize();
FCEUI_SetSoundVolume(256);
FCEUI_Sound(32050);
GameInfo = (FCEUGI*)FCEUI_LoadGame(game->path, (uint8_t*)game->data, game->size);
if (!GameInfo)
return false;
emulator_set_input();
emulator_set_custom_palette();
FCEUD_SoundToggle();
return true;
}
void retro_deinit (void) void retro_deinit (void)
{ {
FCEUI_CloseGame(); FCEUI_CloseGame();
@@ -681,7 +652,7 @@ static void check_variables(void)
current_palette = 15; current_palette = 15;
if (current_palette != orig_value) if (current_palette != orig_value)
emulator_set_custom_palette(); retro_set_custom_palette();
} }
} }
@@ -882,6 +853,8 @@ input_cheat:
bool retro_load_game(const struct retro_game_info *game) bool retro_load_game(const struct retro_game_info *game)
{ {
char* dir=NULL;
struct retro_input_descriptor desc[] = { struct retro_input_descriptor desc[] = {
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" },
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" },
@@ -924,8 +897,24 @@ bool retro_load_game(const struct retro_game_info *game)
environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc); environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
if (!fceu_init(game)) if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
FCEUI_SetBaseDirectory(dir);
FCEUI_Initialize();
FCEUI_SetSoundVolume(256);
FCEUI_Sound(32050);
GameInfo = (FCEUGI*)FCEUI_LoadGame(game->path, (uint8_t*)game->data, game->size);
if (!GameInfo)
return false; return false;
FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn[0], 0);
FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn[0], 0);
retro_set_custom_palette();
FCEUD_SoundToggle();
check_variables(); check_variables();
if (!environ_cb(RETRO_ENVIRONMENT_GET_OVERSCAN, &use_overscan)) if (!environ_cb(RETRO_ENVIRONMENT_GET_OVERSCAN, &use_overscan))