diff --git a/src/g_game.c b/src/g_game.c index bdb541751..1f2c78b66 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3913,7 +3913,6 @@ static void G_DoCompleted(void) nextmap = G_RandMap(G_TOLFlag(gametype), prevmap, false, 0, false, NULL); } - // We are committed to this map now. // We may as well allocate its header if it doesn't exist // (That is, if it's a real map) @@ -8891,5 +8890,4 @@ INT32 G_TicsToCentiseconds(tic_t tics) INT32 G_TicsToMilliseconds(tic_t tics) { return (INT32)((tics%TICRATE) * (1000.00f/TICRATE)); -} - +} \ No newline at end of file diff --git a/src/k_kart.c b/src/k_kart.c index 091359607..47e0f4b80 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3118,8 +3118,8 @@ static void K_StretchPlayerGravity(player_t *p) fixed_t rzsDiv = 1; fixed_t slamDiv = 1; - fixed_t dxs = p->mo->realxscale; - fixed_t dys = p->mo->realyscale; + fixed_t dxs = p->mo->scale; + fixed_t dys = p->mo->scale; //boolean gravSlamming = false; //fixed_t impactFactor = 0; stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value); @@ -6457,10 +6457,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (cv_gravstretch.value > 13107) K_StretchPlayerGravity(player); else - { - player->mo->spritexscale = player->mo->realxscale; - player->mo->spriteyscale = player->mo->realyscale; - } + player->mo->spritexscale = player->mo->spriteyscale = player->mo->scale; boolean usedist = false; diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index 9a7ea9828..1bd8f1d5f 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -271,9 +271,9 @@ int mobj_spritescale_setter(lua_State *L) { // Mmm yea if (spritescale == &mo->spritexscale) - mo->realxscale = luaL_checkfixed(L, 2); + mo->spritexscale = luaL_checkfixed(L, 2); else - mo->realyscale = luaL_checkfixed(L, 2); + mo->spriteyscale = luaL_checkfixed(L, 2); } return 0; } diff --git a/src/p_mobj.c b/src/p_mobj.c index fe226b054..3455a996f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9678,9 +9678,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) } // Sprite rendering - mobj->realxscale = mobj->realyscale = mobj->scale; - mobj->spritexscale = mobj->realxscale; - mobj->spriteyscale = mobj->realyscale; + mobj->spritexscale = mobj->spriteyscale = mobj->scale; mobj->spritexoffset = mobj->spriteyoffset = 0; // Funni slam sound when landing diff --git a/src/p_mobj.h b/src/p_mobj.h index 5d26f9b44..e2d748482 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -297,8 +297,6 @@ typedef struct mobj_s fixed_t old_spritexscale, old_spriteyscale; fixed_t old_spritexoffset, old_spriteyoffset; - fixed_t realxscale, realyscale; // funn-E streeetch - fixed_t stretchslam; // "squish" effect when you land //sloperollangle diff --git a/src/p_saveg.c b/src/p_saveg.c index 3d1451eec..cc78764a4 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1990,8 +1990,6 @@ static void LoadMobjThinker(actionf_p1 thinker) mobj->spriteyoffset = mobj->old_spriteyoffset = 0; mobj->spritexscale = mobj->old_spritexscale = FRACUNIT; mobj->spriteyscale = mobj->old_spriteyscale = FRACUNIT; - mobj->realxscale = FRACUNIT; - mobj->realyscale = FRACUNIT; mobj->stretchslam = 0; mobj->slamsoundtimer = 0;