thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-03 07:22:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge lua_script.h

Browse source
This commit is contained in:
SteelT 2020-08-10 12:19:28 -04:00
parent f8ea416a97
commit 2b2596b4b3
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lua_script.h
View file

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