From 37009ac9b040fb1340d44e8a24fb38e605c8eade Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Thu, 3 Oct 2019 10:31:34 -0400
Subject: [PATCH] A few stashed fixes that didn't make it to the branches
 somehow

---
 src/f_wipe.c | 8 +++++---
 src/info.c   | 7 -------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/f_wipe.c b/src/f_wipe.c
index 12887acf5..8d73c1fe7 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -461,11 +461,13 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean r
 #endif
 		F_DoWipe(fmask, fcolor, reverse);
 
-#ifndef HWRENDER
 		if (encorewiggle)
-			F_DoEncoreWiggle(wipeframe); // Can't think of a better way to run this on fades, unfortunately.
+		{
+#ifdef HWRENDER
+			if (rendermode != render_opengl)
 #endif
-
+				F_DoEncoreWiggle(wipeframe);
+		}
 
 		I_OsPolling();
 		I_UpdateNoBlit();
diff --git a/src/info.c b/src/info.c
index c960ebff6..4f448cc00 100644
--- a/src/info.c
+++ b/src/info.c
@@ -20382,13 +20382,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 	    0,              // damage
 	    sfx_None,       // activesound
 	    MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags
-	    8<<FRACBITS,    // radius
-	    16<<FRACBITS,   // height
-	    0,              // display offset
-	    100,            // mass
-	    0,              // damage
-	    sfx_None,       // activesound
-	    MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
 	    S_NULL          // raisestate
 	},