diff --git a/src/info/skincolors.h b/src/info/skincolors.h index 5adfc6b69..870439c96 100644 --- a/src/info/skincolors.h +++ b/src/info/skincolors.h @@ -32,7 +32,7 @@ _(FLAME) _(SCARLET) _(KETCHUP) _(DAWN) -_(SUNSLAM) +_(SUNSET) _(CREAMSICLE) _(ORANGE) _(PUMPKIN) diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 4f599e572..7ac322188 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -3374,6 +3374,20 @@ static int lib_gGametypeHasSpectators(lua_State *L) return 1; } +static int lib_gBattleGametype(lua_State *L) +{ + //HUDSAFE + lua_pushboolean(L, (gametype == GT_BATTLE)); + return 1; +} + +static int lib_gRaceGametype(lua_State *L) +{ + //HUDSAFE + lua_pushboolean(L, (gametype == GT_RACE)); + return 1; +} + static int lib_gTicsToHours(lua_State *L) { tic_t rtic = luaL_checkinteger(L, 1); @@ -3415,20 +3429,6 @@ static int lib_gTicsToMilliseconds(lua_State *L) return 1; } -static int lib_gRaceGametype(lua_State *L) -{ - //HUDSAFE - lua_pushinteger(L, (gametype == GT_RACE)); - return 1; -} - -static int lib_gBattleGametype(lua_State *L) -{ - //HUDSAFE - lua_pushinteger(L, (gametype == GT_BATTLE)); - return 1; -} - // K_KART //////////// diff --git a/src/p_enemy.c b/src/p_enemy.c index 214a14bd3..8f42ae518 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -10233,7 +10233,7 @@ void P_InternalFlickySetColor(mobj_t *actor, UINT8 color) SKINCOLOR_LAVENDER, SKINCOLOR_RUBY, SKINCOLOR_BLOSSOM, - SKINCOLOR_SUNSLAM, + SKINCOLOR_SUNSET, SKINCOLOR_ORANGE, SKINCOLOR_YELLOW, };