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

Merge lua_maplib.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-05 14:04:13 -04:00
parent cc1afaa838
commit 3ad209a366
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lua_maplib.c
View file

@ -2089,12 +2089,8 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->levelflags);
else if (fastcmp(field,"menuflags"))
lua_pushinteger(L, header->menuflags);
<<<<<<< HEAD
/*else if (fastcmp(field,"automap"))
lua_pushboolean(L, header->automap);*/
else if (fastcmp(field,"mobj_scale"))
lua_pushfixed(L, header->mobj_scale);
=======
else if (fastcmp(field,"startrings"))
lua_pushinteger(L, header->startrings);
else if (fastcmp(field, "sstimer"))
@ -2103,7 +2099,6 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->ssspheres);
else if (fastcmp(field, "gravity"))
lua_pushfixed(L, header->gravity);
>>>>>>> srb2/next
// TODO add support for reading numGradedMares and grades
else {
// Read custom vars now