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

Added emu.exit() function to Lua, added description to fceux.chm about it

This commit is contained in:
Alexey 'Cluster' Avdyukhin 2020-12-12 13:38:11 +03:00
parent c1bc9a7ea8
commit 3bab27ff76
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
output/fceux.chm
View File

Binary file not shown.

12
src/lua-engine.cpp
View File

@ -310,6 +310,8 @@ CTASSERT(sizeof(luaMemHookTypeStrings)/sizeof(*luaMemHookTypeStrings) == LUAMEM
static char* rawToCString(lua_State* L, int idx=0); static char* rawToCString(lua_State* L, int idx=0);
static const char* toCString(lua_State* L, int idx=0); static const char* toCString(lua_State* L, int idx=0);
static int exitScheduled = FALSE;
/** /**
* Resets emulator speed / pause states after script exit. * Resets emulator speed / pause states after script exit.
*/ */
@ -649,6 +651,13 @@ static int emu_loadrom(lua_State *L)
return 0; return 0;
} }
// emu.exit()
//
// Closes the fceux
static int emu_exit(lua_State *L) {
exitScheduled = TRUE;
return 0;
}
static int emu_registerbefore(lua_State *L) { static int emu_registerbefore(lua_State *L) {
if (!lua_isnil(L,1)) if (!lua_isnil(L,1))
@ -5895,6 +5904,7 @@ static const struct luaL_reg emulib [] = {
{"getdir", emu_getdir}, {"getdir", emu_getdir},
{"loadrom", emu_loadrom}, {"loadrom", emu_loadrom},
{"print", print}, // sure, why not {"print", print}, // sure, why not
{"exit", emu_exit}, // useful for run-and-close scripts
{NULL,NULL} {NULL,NULL}
}; };
@ -6195,6 +6205,8 @@ void FCEU_LuaFrameBoundary()
FCEU_LuaOnStop(); FCEU_LuaOnStop();
} }
if (exitScheduled)
DoFCEUExit();
} }
/** /**