From 0ccf2bb9ef765b7bf14b9c279186dc9b5d9b8b45 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 28 Nov 2021 20:01:00 +0100 Subject: [PATCH] - WHaven: fixed automap HUD display. --- source/core/rendering/scene/hw_drawinfo.cpp | 4 ++-- source/games/whaven/src/render.cpp | 9 +++++---- wadsrc/static/zscript/games/wh/ui/sbar.zs | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/core/rendering/scene/hw_drawinfo.cpp b/source/core/rendering/scene/hw_drawinfo.cpp index 848e6fa08..900c89e80 100644 --- a/source/core/rendering/scene/hw_drawinfo.cpp +++ b/source/core/rendering/scene/hw_drawinfo.cpp @@ -299,8 +299,8 @@ void HWDrawInfo::DispatchSprites() if ((tspr->cstat & CSTAT_SPRITE_ALIGNMENT) != CSTAT_SPRITE_ALIGNMENT_SLAB && tiletovox[tspr->picnum] >= 0 && voxmodels[tiletovox[tspr->picnum]]) { HWSprite hwsprite; - int num = tiletovox[tspr->picnum]; - if (hwsprite.ProcessVoxel(this, voxmodels[tiletovox[tspr->picnum]], tspr, §or[tspr->sectnum], voxrotate[num])) + int num = tiletovox[tilenum]; + if (hwsprite.ProcessVoxel(this, voxmodels[num], tspr, §or[tspr->sectnum], voxrotate[num])) continue; } else if ((tspr->cstat & CSTAT_SPRITE_ALIGNMENT) == CSTAT_SPRITE_ALIGNMENT_SLAB && tspr->picnum < MAXVOXELS && voxmodels[tspr->picnum]) diff --git a/source/games/whaven/src/render.cpp b/source/games/whaven/src/render.cpp index 380e03133..5cabb7636 100644 --- a/source/games/whaven/src/render.cpp +++ b/source/games/whaven/src/render.cpp @@ -108,16 +108,17 @@ void drawscreen(int num, double dasmoothratio, bool sceneonly) if (!sceneonly) { + if (automapMode != am_off) + { + DrawOverheadMap(cposx, cposy, cang.asbuild(), dasmoothratio); + } + applyflash(); if (!plr.over_shoulder_on) { DrawHud(dasmoothratio); } - if (automapMode != am_off) - { - DrawOverheadMap(cposx, cposy, cang.asbuild(), dasmoothratio); - } } RestoreInterpolations(); } diff --git a/wadsrc/static/zscript/games/wh/ui/sbar.zs b/wadsrc/static/zscript/games/wh/ui/sbar.zs index 7814b98d6..f654d0b4a 100644 --- a/wadsrc/static/zscript/games/wh/ui/sbar.zs +++ b/wadsrc/static/zscript/games/wh/ui/sbar.zs @@ -479,6 +479,7 @@ class WHStatusBar : RazeStatusBar stats.spacing = stats.fontScale * SmallFont.GetHeight() + 1; stats.screenbottomspace = bottomy; stats.statfont = SmallFont; + stats.altspacing = stats.spacing; if (automapMode == am_full) {