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_mobjlib.c

Browse source
This commit is contained in:
SteelT 2020-08-10 12:34:10 -04:00
parent d502ca31cb
commit 676bdc8cba
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lua_mobjlib.c
View file

@ -89,16 +89,12 @@ enum mobj_e {
mobj_cvmem, mobj_cvmem,
mobj_standingslope, mobj_standingslope,
mobj_colorized, mobj_colorized,
<<<<<<< HEAD mobj_mirrored,
mobj_shadowscale, mobj_shadowscale,
mobj_whiteshadow, mobj_whiteshadow,
mobj_sprxoff, mobj_sprxoff,
mobj_spryoff, mobj_spryoff,
mobj_sprzoff mobj_sprzoff
=======
mobj_mirrored,
mobj_shadowscale
>>>>>>> srb2/next
}; };
static const char *const mobj_opt[] = { static const char *const mobj_opt[] = {
@ -493,16 +489,6 @@ static int mobj_set(lua_State *L)
return UNIMPLEMENTED; return UNIMPLEMENTED;
case mobj_angle: case mobj_angle:
mo->angle = luaL_checkangle(L, 3); mo->angle = luaL_checkangle(L, 3);
<<<<<<< HEAD
if (mo->player == &players[consoleplayer])
localangle[0] = mo->angle;
else if (mo->player == &players[displayplayers[1]])
localangle[1] = mo->angle;
else if (mo->player == &players[displayplayers[2]])
localangle[2] = mo->angle;
else if (mo->player == &players[displayplayers[3]])
localangle[3] = mo->angle;
=======
if (mo->player) if (mo->player)
P_SetPlayerAngle(mo->player, mo->angle); P_SetPlayerAngle(mo->player, mo->angle);
break; break;
@ -511,7 +497,6 @@ static int mobj_set(lua_State *L)
break; break;
case mobj_roll: case mobj_roll:
mo->roll = luaL_checkangle(L, 3); mo->roll = luaL_checkangle(L, 3);
>>>>>>> srb2/next
break; break;
case mobj_rollangle: case mobj_rollangle:
mo->rollangle = luaL_checkangle(L, 3); mo->rollangle = luaL_checkangle(L, 3);