From e64a6f7e30ed4ec89729f189ec1f136e3576465a Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 23 Jan 2022 12:23:55 +0100 Subject: [PATCH] - Blood: Fixed choking hand with new renderer. This gets directed to the weapon 3D drawer, but for that it was processed too late. --- source/games/blood/src/hudsprites.cpp | 7 +++++++ source/games/blood/src/view.cpp | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/games/blood/src/hudsprites.cpp b/source/games/blood/src/hudsprites.cpp index d1b595f25..792bb3fdc 100644 --- a/source/games/blood/src/hudsprites.cpp +++ b/source/games/blood/src/hudsprites.cpp @@ -172,6 +172,13 @@ void hudDraw(PLAYER* gView, sectortype* pSector, double bobx, double boby, doubl drawElement(0, 237, 2358, 1, 0, 1, -1); drawElement(320, 237, 2358, 1, 1, 1, 1); } + + int zn = ((gView->zWeapon - gView->zView - (12 << 8)) >> 7) + 220; + PLAYER* pPSprite = &gPlayer[gMe->actor->spr.type - kDudePlayer1]; + if (gMe->actor->IsPlayerActor() && pPSprite->hand == 1) + { + gChoke.animateChoke(160, zn, (int)gInterpolate); + } } END_BLD_NS diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp index 18171187a..d5131da99 100644 --- a/source/games/blood/src/view.cpp +++ b/source/games/blood/src/view.cpp @@ -827,12 +827,6 @@ void viewDrawScreen(bool sceneonly) DrawMap(gView->actor); } UpdateStatusBar(); - int zn = ((gView->zWeapon - gView->zView - (12 << 8)) >> 7) + 220; - PLAYER* pPSprite = &gPlayer[gMe->actor->spr.type - kDudePlayer1]; - if (gMe->actor->IsPlayerActor() && pPSprite->hand == 1) - { - gChoke.animateChoke(160, zn, (int)gInterpolate); - } viewDrawAimedPlayerName(); if (paused)