From fb2c4efa2f5f4d3deff4c8e1516fd92b8bcf104e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 16 Sep 2022 18:22:16 +0200 Subject: [PATCH] =?UTF-8?q?-=20eliminated=20the=20last=20place=20where=20t?= =?UTF-8?q?spritetype=E2=80=99s=20add=5Fint=5Fz=20was=20used?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/core/maptypes.h | 7 +------ source/games/blood/src/animatesprite.cpp | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/source/core/maptypes.h b/source/core/maptypes.h index d2159829e..c8360d10e 100644 --- a/source/core/maptypes.h +++ b/source/core/maptypes.h @@ -516,11 +516,6 @@ struct tspritetype : public spritetypebase { DCoreActor* ownerActor; int time; - - void add_int_z(int x) - { - pos.Z += x * zinttoworld; - } }; class tspriteArray @@ -737,4 +732,4 @@ void validateStartSector(const char* filename, const DVector3& pos, int* cursect constexpr DAngle mapangle(int mapang) { return DAngle::fromBuild(mapang); -} \ No newline at end of file +} diff --git a/source/games/blood/src/animatesprite.cpp b/source/games/blood/src/animatesprite.cpp index ddcf95672..65f377800 100644 --- a/source/games/blood/src/animatesprite.cpp +++ b/source/games/blood/src/animatesprite.cpp @@ -390,7 +390,7 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF pNSprite->pal = 5; int height = tileHeight(pNSprite->picnum); int center = height / 2 + tileTopOffset(pNSprite->picnum); - pNSprite->add_int_z(-(pNSprite->yrepeat << 2) * (height - center)); + pNSprite->pos.Z -= (pNSprite->yrepeat * REPEAT_SCALE) * (height - center); break; } case kViewEffectFlareHalo: