mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge lua_script.h
This commit is contained in:
parent
f8ea416a97
commit
2b2596b4b3
1 changed files with 0 additions and 4 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue