thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge lua_skinlib.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-05 14:16:17 -04:00
parent 7f94fe0d93
commit 54f442d2fd
1 changed files with 0 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
src/lua_skinlib.c
View file

@ -26,7 +26,6 @@ enum skin {
skin_flags, skin_flags,
skin_realname, skin_realname,
skin_hudname, skin_hudname,
<<<<<<< HEAD
skin_facerank, skin_facerank,
skin_facewant, skin_facewant,
skin_facemmap, skin_facemmap,
@ -34,28 +33,7 @@ enum skin {
skin_kartspeed, skin_kartspeed,
skin_kartweight, skin_kartweight,
// //
=======
skin_ability,
skin_ability2,
skin_thokitem,
skin_spinitem,
skin_revitem,
skin_followitem, 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_starttranscolor,
skin_prefcolor, skin_prefcolor,
skin_supercolor, skin_supercolor,
@ -74,7 +52,6 @@ static const char *const skin_opt[] = {
"flags", "flags",
"realname", "realname",
"hudname", "hudname",
<<<<<<< HEAD
"facerank", "facerank",
"facewant", "facewant",
"facemmap", "facemmap",
@ -82,28 +59,7 @@ static const char *const skin_opt[] = {
"kartspeed", "kartspeed",
"kartweight", "kartweight",
// //
=======
"ability",
"ability2",
"thokitem",
"spinitem",
"revitem",
"followitem", "followitem",
"actionspd",
"mindash",
"maxdash",
"normalspeed",
"runspeed",
"thrustfactor",
"accelstart",
"acceleration",
"jumpfactor",
"radius",
"height",
"spinheight",
"shieldscale",
"camerascale",
>>>>>>> srb2/next
"starttranscolor", "starttranscolor",
"prefcolor", "prefcolor",
"supercolor", "supercolor",
@ -147,7 +103,6 @@ static int skin_get(lua_State *L)
case skin_hudname: case skin_hudname:
lua_pushstring(L, skin->hudname); lua_pushstring(L, skin->hudname);
break; break;
<<<<<<< HEAD
case skin_facerank: case skin_facerank:
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
if (!skin->facerank[i]) if (!skin->facerank[i])
@ -174,68 +129,9 @@ static int skin_get(lua_State *L)
lua_pushinteger(L, skin->kartweight); lua_pushinteger(L, skin->kartweight);
break; 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: case skin_followitem:
lua_pushinteger(L, skin->followitem); lua_pushinteger(L, skin->followitem);
break; 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: case skin_starttranscolor:
lua_pushinteger(L, skin->starttranscolor); lua_pushinteger(L, skin->starttranscolor);
break; break;