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

Backport some stuff in this commit - aea20914a6

Browse Source
This commit is contained in:
twinaphex
2014-12-08 21:26:40 +01:00
parent 6a9071669d
commit 39a70abf71
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,7 +230,6 @@ int NSFLoad(FCEUFILE *fp);
FCEUGI *FCEUI_LoadGame(const char *name) FCEUGI *FCEUI_LoadGame(const char *name)
{ {
FCEUFILE *fp; FCEUFILE *fp;
char *ipsfn;
ResetGameLoaded(); ResetGameLoaded();
@@ -250,9 +249,7 @@ FCEUGI *FCEUI_LoadGame(const char *name)
GetFileBase(name); GetFileBase(name);
ipsfn = FCEU_MakeFName(FCEUMKF_IPS, 0, 0); fp = FCEU_fopen(name, NULL, "rb", 0);
fp = FCEU_fopen(name, ipsfn, "rb", 0);
free(ipsfn);
if (!fp) { if (!fp) {
FCEU_PrintError("Error opening \"%s\"!", name); FCEU_PrintError("Error opening \"%s\"!", name);

4
src/drivers/libretro/fceu/video.c
View File

@@ -55,8 +55,8 @@ int FCEU_InitVirtualVideo(void)
if (sizeof(uint8*) == 4) if (sizeof(uint8*) == 4)
{ {
uint32 m; uintptr_t m;
m = *XBuf; m = (uintptr_t)*XBuf;
m = (4 - m) & 3; m = (4 - m) & 3;
XBuf += m; XBuf += m;
} }