From e77325f2a4e9cc2749496402de519c3ca44679d9 Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 16 Oct 2018 06:09:42 +0000 Subject: [PATCH] Remove redundant assignments git-svn-id: https://svn.eduke32.com/eduke32@7077 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/game.cpp | 5 ----- source/duke3d/src/sector.cpp | 9 ++++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 088307c45..508c7a621 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -3937,11 +3937,6 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo uspritetype *const playerTyping = t; playerTyping->statnum = TSPR_TEMP; - playerTyping->yrepeat = (t->yrepeat >> 3); - - if (playerTyping->yrepeat < 4) - playerTyping->yrepeat = 4; - playerTyping->cstat = 0; playerTyping->picnum = RESPAWNMARKERGREEN; playerTyping->z = (pSprite->owner >= 0) ? (g_player[playerNum].ps->pos.z - (20 << 8)) : (pSprite->z - (96 << 8)); diff --git a/source/duke3d/src/sector.cpp b/source/duke3d/src/sector.cpp index 97832b992..f981b16d8 100644 --- a/source/duke3d/src/sector.cpp +++ b/source/duke3d/src/sector.cpp @@ -859,10 +859,9 @@ REDODOOR: if (pSector->lotag & 0x8000u) { - // WTF? int const q = (pSector->ceilingz + pSector->floorz) >> 1; - j = SetAnimation(sectNum, &pSector->floorz, q, pSector->extra); - j = SetAnimation(sectNum, &pSector->ceilingz, q, pSector->extra); + SetAnimation(sectNum, &pSector->floorz, q, pSector->extra); + SetAnimation(sectNum, &pSector->ceilingz, q, pSector->extra); } else { @@ -871,8 +870,8 @@ REDODOOR: if (floorNeighbor>=0 && ceilingNeighbor>=0) { - j = SetAnimation(sectNum, &pSector->floorz, sector[floorNeighbor].floorz, pSector->extra); - j = SetAnimation(sectNum, &pSector->ceilingz, sector[ceilingNeighbor].ceilingz, pSector->extra); + SetAnimation(sectNum, &pSector->floorz, sector[floorNeighbor].floorz, pSector->extra); + SetAnimation(sectNum, &pSector->ceilingz, sector[ceilingNeighbor].ceilingz, pSector->extra); } else {