From 54f442d2fdfbefda2d69a5ddf5ce958fd927fd4a Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Wed, 5 Aug 2020 14:16:17 -0400
Subject: [PATCH] Merge lua_skinlib.c

---
 src/lua_skinlib.c | 104 ----------------------------------------------
 1 file changed, 104 deletions(-)

diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index b2b96b393..a5f1f7196 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -26,7 +26,6 @@ enum skin {
 	skin_flags,
 	skin_realname,
 	skin_hudname,
-<<<<<<< HEAD
 	skin_facerank,
 	skin_facewant,
 	skin_facemmap,
@@ -34,28 +33,7 @@ enum skin {
 	skin_kartspeed,
 	skin_kartweight,
 	//
-=======
-	skin_ability,
-	skin_ability2,
-	skin_thokitem,
-	skin_spinitem,
-	skin_revitem,
 	skin_followitem,
-	skin_actionspd,
-	skin_mindash,
-	skin_maxdash,
-	skin_normalspeed,
-	skin_runspeed,
-	skin_thrustfactor,
-	skin_accelstart,
-	skin_acceleration,
-	skin_jumpfactor,
-	skin_radius,
-	skin_height,
-	skin_spinheight,
-	skin_shieldscale,
-	skin_camerascale,
->>>>>>> srb2/next
 	skin_starttranscolor,
 	skin_prefcolor,
 	skin_supercolor,
@@ -74,7 +52,6 @@ static const char *const skin_opt[] = {
 	"flags",
 	"realname",
 	"hudname",
-<<<<<<< HEAD
 	"facerank",
 	"facewant",
 	"facemmap",
@@ -82,28 +59,7 @@ static const char *const skin_opt[] = {
 	"kartspeed",
 	"kartweight",
 	//
-=======
-	"ability",
-	"ability2",
-	"thokitem",
-	"spinitem",
-	"revitem",
 	"followitem",
-	"actionspd",
-	"mindash",
-	"maxdash",
-	"normalspeed",
-	"runspeed",
-	"thrustfactor",
-	"accelstart",
-	"acceleration",
-	"jumpfactor",
-	"radius",
-	"height",
-	"spinheight",
-	"shieldscale",
-	"camerascale",
->>>>>>> srb2/next
 	"starttranscolor",
 	"prefcolor",
 	"supercolor",
@@ -147,7 +103,6 @@ static int skin_get(lua_State *L)
 	case skin_hudname:
 		lua_pushstring(L, skin->hudname);
 		break;
-<<<<<<< HEAD
 	case skin_facerank:
 		for (i = 0; i < 8; i++)
 			if (!skin->facerank[i])
@@ -174,68 +129,9 @@ static int skin_get(lua_State *L)
 		lua_pushinteger(L, skin->kartweight);
 		break;
 	//
-=======
-	case skin_ability:
-		lua_pushinteger(L, skin->ability);
-		break;
-	case skin_ability2:
-		lua_pushinteger(L, skin->ability2);
-		break;
-	case skin_thokitem:
-		lua_pushinteger(L, skin->thokitem);
-		break;
-	case skin_spinitem:
-		lua_pushinteger(L, skin->spinitem);
-		break;
-	case skin_revitem:
-		lua_pushinteger(L, skin->revitem);
-		break;
 	case skin_followitem:
 		lua_pushinteger(L, skin->followitem);
 		break;
-	case skin_actionspd:
-		lua_pushfixed(L, skin->actionspd);
-		break;
-	case skin_mindash:
-		lua_pushfixed(L, skin->mindash);
-		break;
-	case skin_maxdash:
-		lua_pushfixed(L, skin->maxdash);
-		break;
-	case skin_normalspeed:
-		lua_pushfixed(L, skin->normalspeed);
-		break;
-	case skin_runspeed:
-		lua_pushfixed(L, skin->runspeed);
-		break;
-	case skin_thrustfactor:
-		lua_pushinteger(L, skin->thrustfactor);
-		break;
-	case skin_accelstart:
-		lua_pushinteger(L, skin->accelstart);
-		break;
-	case skin_acceleration:
-		lua_pushinteger(L, skin->acceleration);
-		break;
-	case skin_jumpfactor:
-		lua_pushfixed(L, skin->jumpfactor);
-		break;
-	case skin_radius:
-		lua_pushfixed(L, skin->radius);
-		break;
-	case skin_height:
-		lua_pushfixed(L, skin->height);
-		break;
-	case skin_spinheight:
-		lua_pushfixed(L, skin->spinheight);
-		break;
-	case skin_shieldscale:
-		lua_pushfixed(L, skin->shieldscale);
-		break;
-	case skin_camerascale:
-		lua_pushfixed(L, skin->camerascale);
-		break;
->>>>>>> srb2/next
 	case skin_starttranscolor:
 		lua_pushinteger(L, skin->starttranscolor);
 		break;