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

Merge pull request #415 from Dwedit/save_state_fix

Browse Source 
Save state fix
This commit is contained in:
Autechre
2020-12-30 22:08:04 +01:00
committed by GitHub
parent 2e408ab958 d87f7e5b34
commit 9223fe174f
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fceu-types.h
View File

@@ -39,7 +39,7 @@ typedef uint32_t uint32;
typedef unsigned long long uint64; typedef unsigned long long uint64;
typedef long long int64; typedef long long int64;
#define GINLINE inline #define GINLINE inline
#elif MSVC #elif MSVC | _MSC_VER
typedef __int64 int64; typedef __int64 int64;
typedef unsigned __int64 uint64; typedef unsigned __int64 uint64;
#define GINLINE /* Can't declare a function INLINE #define GINLINE /* Can't declare a function INLINE

7
src/ines.c
View File

@@ -1099,7 +1099,12 @@ static int iNES_Init(int num) {
} }
} }
if (head.ROM_type & 8) if (head.ROM_type & 8)
AddExState(ExtraNTARAM, 2048, 0, "EXNR"); {
if (ExtraNTARAM != NULL)
{
AddExState(ExtraNTARAM, 2048, 0, "EXNR");
}
}
tmp->init(&iNESCart); tmp->init(&iNESCart);
return 1; return 1;
} }

2
src/state.c
View File

@@ -325,6 +325,8 @@ void ResetExState(void (*PreSave)(void), void (*PostSave)(void))
void AddExState(void *v, uint32 s, int type, char *desc) void AddExState(void *v, uint32 s, int type, char *desc)
{ {
/* prevent adding a terminator to the list if a NULL pointer was provided */
if (v == NULL) return;
memset(SFMDATA[SFEXINDEX].desc, 0, sizeof(SFMDATA[SFEXINDEX].desc)); memset(SFMDATA[SFEXINDEX].desc, 0, sizeof(SFMDATA[SFEXINDEX].desc));
if (desc) if (desc)
strncpy(SFMDATA[SFEXINDEX].desc, desc, sizeof(SFMDATA[SFEXINDEX].desc)); strncpy(SFMDATA[SFEXINDEX].desc, desc, sizeof(SFMDATA[SFEXINDEX].desc));