- Exhumed: fix animation stopping for inventory torch item.

I have no idea how the old code could ever work...
ZDoom · May 16, 2021 · 24ce5d6 · 24ce5d6
1 parent 395de23
commit 24ce5d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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