From 14e98df69b6c097e4e737a26763c660d28e8b067 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 16 Dec 2018 22:57:39 +0000
Subject: [PATCH] Revert "Merge branch 'kart-luatextures-backport' into 'next'"
This reverts merge request !387
---
src/lua_baselib.c | 23 -----------------------
src/lua_maplib.c | 8 ++++----
2 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index a178b17fb..969987762 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1682,25 +1682,6 @@ static int lib_rSetPlayerSkin(lua_State *L)
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
////////////
@@ -2184,10 +2165,6 @@ static luaL_Reg lib[] = {
{"R_Frame2Char",lib_rFrame2Char},
{"R_SetPlayerSkin",lib_rSetPlayerSkin},
- // r_data
- {"R_CheckTextureNumForName",lib_rCheckTextureNumForName),
- {"R_TextureNumForName",lib_rTextureNumForName),
-
// s_sound
{"S_StartSound",lib_sStartSound},
{"S_StartSoundAtVolume",lib_sStartSoundAtVolume},
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 5eb6cb4a1..efe9e6f4c 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -795,16 +795,16 @@ static int side_set(lua_State *L)
side->rowoffset = luaL_checkfixed(L, 3);
break;
case side_toptexture:
- side->toptexture = luaL_checkinteger(L, 3);
+ side->toptexture = luaL_checkinteger(L, 3);
break;
case side_bottomtexture:
- side->bottomtexture = luaL_checkinteger(L, 3);
+ side->bottomtexture = luaL_checkinteger(L, 3);
break;
case side_midtexture:
- side->midtexture = luaL_checkinteger(L, 3);
+ side->midtexture = luaL_checkinteger(L, 3);
break;
case side_repeatcnt:
- side->repeatcnt = luaL_checkinteger(L, 3);
+ side->repeatcnt = luaL_checkinteger(L, 3);
break;
}
return 0;