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

C89 buildfixes

Browse Source
This commit is contained in:
twinaphex
2017-07-01 11:01:46 +02:00
parent 90bed81e8f
commit 8f2d28e4e5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,6 +800,8 @@ static void retro_set_custom_palette (void)
void FCEUD_RegionOverride(int region) void FCEUD_RegionOverride(int region)
{ {
static int w = 0; static int w = 0;
struct retro_system_av_info av_info;
switch (region) switch (region)
{ {
case 0: /* auto */ case 0: /* auto */
@@ -831,7 +833,6 @@ void FCEUD_RegionOverride(int region)
SetSoundVariables(); SetSoundVariables();
// Update the geometry // Update the geometry
struct retro_system_av_info av_info;
retro_get_system_av_info(&av_info); retro_get_system_av_info(&av_info);
environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info); environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
} }
@@ -880,6 +881,7 @@ static void check_variables(bool startup)
struct retro_variable var = {0}; struct retro_variable var = {0};
struct retro_system_av_info av_info; struct retro_system_av_info av_info;
bool geometry_update = false; bool geometry_update = false;
unsigned old_regionoverride = regionoverride;
var.key = "fceumm_palette"; var.key = "fceumm_palette";
@@ -1057,7 +1059,6 @@ static void check_variables(bool startup)
turbo_delay = 60; turbo_delay = 60;
} }
} }
unsigned old_regionoverride = regionoverride;
var.key = "fceumm_region"; var.key = "fceumm_region";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{ {

11
src/ppu.c
View File

@@ -661,16 +661,19 @@ static void Fixit1(void) {
} }
void MMC5_hb(int); //Ugh ugh ugh. void MMC5_hb(int); //Ugh ugh ugh.
static void DoLine(void) { static void DoLine(void)
if (scanline >= 240 && scanline != totalscanlines) { {
int x;
uint8 *target = NULL;
if (scanline >= 240 && scanline != totalscanlines)
{
X6502_Run(256 + 69); X6502_Run(256 + 69);
scanline++; scanline++;
X6502_Run(16); X6502_Run(16);
return; return;
} }
int x; target = XBuf + ((scanline < 240 ? scanline : 240) << 8);
uint8 *target = XBuf + ((scanline < 240 ? scanline : 240) << 8);
if (MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline); if (MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline);