stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-16 06:30:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport

Browse source
This commit is contained in:
TehRealSalt 2018-12-16 21:22:06 -05:00
commit 97639848e1
2 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/lua_baselib.c
View file

@ -1682,25 +1682,6 @@ static int lib_rSetPlayerSkin(lua_State *L)
return 0; return 0;
} }
// R_DATA
////////////
static int lib_rCheckTextureNumForName(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
//HUDSAFE
lua_pushinteger(L, R_CheckTextureNumForName(name));
return 1;
}
static int lib_rTextureNumForName(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
//HUDSAFE
lua_pushinteger(L, R_TextureNumForName(name));
return 1;
}
// S_SOUND // S_SOUND
//////////// ////////////

8
src/lua_maplib.c
View file

@ -795,16 +795,16 @@ static int side_set(lua_State *L)
side->rowoffset = luaL_checkfixed(L, 3); side->rowoffset = luaL_checkfixed(L, 3);
break; break;
case side_toptexture: case side_toptexture:
side->toptexture = luaL_checkinteger(L, 3); side->toptexture = luaL_checkinteger(L, 3);
break; break;
case side_bottomtexture: case side_bottomtexture:
side->bottomtexture = luaL_checkinteger(L, 3); side->bottomtexture = luaL_checkinteger(L, 3);
break; break;
case side_midtexture: case side_midtexture:
side->midtexture = luaL_checkinteger(L, 3); side->midtexture = luaL_checkinteger(L, 3);
break; break;
case side_repeatcnt: case side_repeatcnt:
side->repeatcnt = luaL_checkinteger(L, 3); side->repeatcnt = luaL_checkinteger(L, 3);
break; break;
} }
return 0; return 0;