ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from TASVideos/master 

Update code to the newest
This commit is contained in:
owomomo 2019-03-21 22:42:46 +08:00 committed by GitHub
parent afbb4fe37f f9094a4655
commit b6518a038c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fceu.cpp
View File

@ -404,7 +404,7 @@ int FDSLoad(const char *name, FCEUFILE *fp);
int NSFLoad(const char *name, FCEUFILE *fp);
//char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron
bool archiveManuallyCanceled;
extern bool archiveManuallyCanceled;
//name should be UTF-8, hopefully, or else there may be trouble
FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent)

19
src/lua-engine.cpp
View File

@ -2711,15 +2711,22 @@ static int savestate_create_aliased(lua_State *L, bool newnumbering) {
int which = -1;
const char* path = NULL;
bool hasArg = false;
if (lua_gettop(L) >= 1) {
if (lua_gettop(L) >= 1)
{
hasArg = true;
path = luaL_checkstring(L, 1);
if(path == NULL) {
which = luaL_checkinteger(L, 1);
if(lua_isnumber(L,1))
{
which = luaL_checkinteger(L,1);
if (which < 1 || which > 10) {
luaL_error(L, "invalid player's savestate %d", which);
}
}
else
{
path = luaL_checkstring(L, 1);
}
}
//lets use lua to allocate the memory, since it is effectively a memory pool.
@ -2730,9 +2737,9 @@ static int savestate_create_aliased(lua_State *L, bool newnumbering) {
// So I turned the filename selection code into my bitch. :)
// Numbers are 0 through 9.
if (newnumbering) //1-9, 10 = 0. QWERTY style.
ss->filename = FCEU_MakeFName(FCEUMKF_STATE, (which % 10), 0);
ss->filename = FCEU_MakeFName(FCEUMKF_STATE, (which % 10), 0);
else // Note: Windows Slots 1-10 = Which 2-10, 1
ss->filename = FCEU_MakeFName(FCEUMKF_STATE, which - 1, 0);
ss->filename = FCEU_MakeFName(FCEUMKF_STATE, which - 1, 0);
// Only ensure load if the file exists
// Also makes it persistent, but files are like that