Merge lua_script.h

This commit is contained in:
SteelT 2020-08-10 12:19:28 -04:00
parent f8ea416a97
commit 2b2596b4b3

View file

@ -37,13 +37,9 @@
void LUA_ClearExtVars(void);
#endif
<<<<<<< HEAD
void LUA_ClearState(void);
extern boolean lua_lumploading; // is LUA_LoadLump being called?
=======
extern INT32 lua_lumploading; // is LUA_LoadLump being called?
>>>>>>> srb2/next
int LUA_GetErrorMessage(lua_State *L);
void LUA_LoadLump(UINT16 wad, UINT16 lump, boolean noresults);