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

Merge lua_script.h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-05 14:03:53 -04:00
parent 9a9f7b8b1f
commit cc1afaa838
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lua_script.h
View file

@ -37,11 +37,9 @@
void LUA_ClearExtVars(void);
#endif
<<<<<<< HEAD
void LUA_ClearState(void);
=======
extern boolean lua_lumploading; // is LUA_LoadLump being called?
>>>>>>> srb2/next
void LUA_LoadLump(UINT16 wad, UINT16 lump);
#ifdef LUA_ALLOW_BYTECODE
@ -57,15 +55,13 @@ void LUA_InvalidatePlayer(player_t *player);
void LUA_Step(void);
void LUA_Archive(void);
void LUA_UnArchive(void);
<<<<<<< HEAD
void LUA_ArchiveDemo(void);
void LUA_UnArchiveDemo(void);
=======
int LUA_PushGlobals(lua_State *L, const char *word);
int LUA_CheckGlobals(lua_State *L, const char *word);
>>>>>>> srb2/next
void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
void LUA_CVarChanged(const char *name); // lua_consolelib.c
int Lua_optoption(lua_State *L, int narg,