From 16d077fde3b35c8a7f53e5744ced16c68de13451 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 5 Oct 2019 20:00:54 +0200
Subject: [PATCH] Coins don't melt in lava and lavafalls have displayoffset 1

---
 src/info.c   | 2 +-
 src/p_mobj.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/info.c b/src/info.c
index ae96b26916..2374c85152 100644
--- a/src/info.c
+++ b/src/info.c
@@ -12765,7 +12765,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		0,              // speed
 		30*FRACUNIT,    // radius
 		32*FRACUNIT,    // height
-		0,              // display offset
+		1,              // display offset
 		100,            // mass
 		0,              // damage
 		sfx_None,       // activesound
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 67a05d4843..f4fe43ecf5 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8834,13 +8834,13 @@ void P_MobjThinker(mobj_t *mobj)
 				}
 				break;
 			case MT_RING:
-			case MT_COIN:
 			case MT_REDTEAMRING:
 			case MT_BLUETEAMRING:
 				P_KillRingsInLava(mobj);
 				if (P_MobjWasRemoved(mobj))
 					return;
 				/* FALLTHRU */
+			case MT_COIN:
 			case MT_BLUESPHERE:
 			case MT_BOMBSPHERE:
 			case MT_NIGHTSCHIP:
@@ -8854,11 +8854,11 @@ void P_MobjThinker(mobj_t *mobj)
 				return;
 			// Flung items
 			case MT_FLINGRING:
-			case MT_FLINGCOIN:
 				P_KillRingsInLava(mobj);
 				if (P_MobjWasRemoved(mobj))
 					return;
 				/* FALLTHRU */
+			case MT_FLINGCOIN:
 			case MT_FLINGBLUESPHERE:
 			case MT_FLINGNIGHTSCHIP:
 				if (mobj->flags2 & MF2_NIGHTSPULL)
-- 
GitLab