From 24ce5d61306b2f4e1e782031e69fc0434eefab38 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 16 May 2021 20:25:56 +0200 Subject: [PATCH] - Exhumed: fix animation stopping for inventory torch item. I have no idea how the old code could ever work... --- source/core/savegamehelp.cpp | 1 + wadsrc/static/zscript/games/exhumed/ui/sbar.zs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/core/savegamehelp.cpp b/source/core/savegamehelp.cpp index a2a2022f5..c3fa929fb 100644 --- a/source/core/savegamehelp.cpp +++ b/source/core/savegamehelp.cpp @@ -160,6 +160,7 @@ bool ReadSavegame(const char* name) arc.Close(); info->Unlock(); delete savereader; + ResetStatusBar(); return true; } return false; diff --git a/wadsrc/static/zscript/games/exhumed/ui/sbar.zs b/wadsrc/static/zscript/games/exhumed/ui/sbar.zs index a70387b0d..f30afc367 100644 --- a/wadsrc/static/zscript/games/exhumed/ui/sbar.zs +++ b/wadsrc/static/zscript/games/exhumed/ui/sbar.zs @@ -487,7 +487,7 @@ class ExhumedStatusBar : RazeStatusBar int newMagicLevel = (1000 - pp.nMagic) / magicperline; newMagicLevel = clamp(newMagicLevel, 0, nMeterRange - 1); - if (newMagicLevel != nMagicLevel) SetItemSeq(pp); + if (newMagicLevel != nMagicLevel || nItemFrames == 0) SetItemSeq(pp); nMagicLevel = newMagicLevel; } @@ -593,7 +593,7 @@ class ExhumedStatusBar : RazeStatusBar if (nItemFrame >= nItemFrames) { - if (nItemSeq == 67) { + if (nItemSeq == 76) { SetItemSeq(pp); } else