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

Update JSReturn

Browse Source
This commit is contained in:
retro-wertz
2017-09-30 13:28:05 +08:00
parent c4c67b4b08
commit e43a3374e1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ unsigned sndvolume = 150;
static volatile int nofocus = 0; static volatile int nofocus = 0;
static int32_t *sound = 0; static int32_t *sound = 0;
static uint32_t JSReturn[4]; static uint32_t JSReturn = 0;
static uint32_t MouseData[3]; static uint32_t MouseData[3];
static uint32_t current_palette = 0; static uint32_t current_palette = 0;
@@ -542,7 +542,7 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
{ {
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
t[port] = RETRO_DEVICE_JOYPAD; t[port] = RETRO_DEVICE_JOYPAD;
FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn[0], 0); FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn, 0);
break; break;
case RETRO_DEVICE_MOUSE: case RETRO_DEVICE_MOUSE:
t[port] = RETRO_DEVICE_MOUSE; t[port] = RETRO_DEVICE_MOUSE;
@@ -1178,7 +1178,7 @@ static void FCEUD_UpdateInput(void)
} }
} }
JSReturn[0] = pad[0] | (pad[1] << 8) | (pad[2] << 16) | (pad[3] << 24); JSReturn = pad[0] | (pad[1] << 8) | (pad[2] << 16) | (pad[3] << 24);
if (t[0] == RETRO_DEVICE_MOUSE || t[1] == RETRO_DEVICE_MOUSE) if (t[0] == RETRO_DEVICE_MOUSE || t[1] == RETRO_DEVICE_MOUSE)
GetMouseData(&MouseData[0]); GetMouseData(&MouseData[0]);
@@ -1737,8 +1737,8 @@ bool retro_load_game(const struct retro_game_info *game)
return false; return false;
} }
FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn[0], 0); FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn, 0);
FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn[0], 0); FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn, 0);
external_palette_exist = ipalette; external_palette_exist = ipalette;
if (external_palette_exist) if (external_palette_exist)
@@ -1769,7 +1769,7 @@ bool retro_load_game(const struct retro_game_info *game)
{ {
if (famicom_4p_db_list[i].crc == iNESGameCRC32) if (famicom_4p_db_list[i].crc == iNESGameCRC32)
{ {
FCEUI_SetInputFC(SIFC_4PLAYER, &JSReturn[0], 0); FCEUI_SetInputFC(SIFC_4PLAYER, &JSReturn, 0);
break; break;
} }
} }

2
src/input.c
View File

@@ -227,7 +227,7 @@ void FCEU_UpdateInput(void)
if (GameInfo && GameInfo->type == GIT_VSUNI) if (GameInfo && GameInfo->type == GIT_VSUNI)
if (coinon) coinon--; if (coinon) coinon--;
if (GameInfo->type == GIT_VSUNI) /* moved to libretro.c */ if (GameInfo->type == GIT_VSUNI)
FCEU_VSUniSwap(&joy[0], &joy[1]); FCEU_VSUniSwap(&joy[0], &joy[1]);
} }