dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Special functions should have common formatting #503

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-01-22 14:28:14 +03:00
parent 607515947c
commit e0cc606d2c
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/luaapi.c
View File

@@ -1335,17 +1335,15 @@ static void callLuaTick(tic_mem* tic)
}
}
static void callLuaScanline(tic_mem* memory, s32 row, void* data)
static void callLuaScanlineName(tic_mem* memory, s32 row, void* data, const char* name)
{
tic_machine* machine = (tic_machine*)memory;
lua_State* lua = machine->lua;
if (lua)
{
const char* ScanlineFunc = ApiKeywords[1];
lua_getglobal(lua, ScanlineFunc);
if(lua_isfunction(lua, -1))
lua_getglobal(lua, name);
if(lua_isfunction(lua, -1))
{
lua_pushinteger(lua, row);
if(lua_pcall(lua, 1, 0, 0) != LUA_OK)
@@ -1355,6 +1353,14 @@ static void callLuaScanline(tic_mem* memory, s32 row, void* data)
}
}
static void callLuaScanline(tic_mem* memory, s32 row, void* data)
{
callLuaScanlineName(memory, row, data, ApiKeywords[1]);
// try to call old scanline
callLuaScanlineName(memory, row, data, "scanline");
}
static void callLuaOverlap(tic_mem* memory, void* data)
{
tic_machine* machine = (tic_machine*)memory;