From f40cfb0271a5945a736c6edafd012174b09f71e8 Mon Sep 17 00:00:00 2001
From: Inuyasha <MattWCSTRFAN@gmail.com>
Date: Wed, 9 Mar 2016 06:22:40 -0800
Subject: [PATCH] Revert "MFE_DUMMY now exists to fill the slot where
MFE_PUSHED was, bleh"
This reverts commit 4625118ee863b43a3c8828c79879f92ff649b850.
---
src/dehacked.c | 1 -
src/p_mobj.h | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index 31cf37636..926c3a488 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -6711,7 +6711,6 @@ static const char *const MOBJEFLAG_LIST[] = {
"JUSTSTEPPEDDOWN", // used for ramp sectors
"VERTICALFLIP", // Vertically flip sprite/allow upside-down physics
"GOOWATER", // Goo water
- "DUMMY", // free: 1<<7
"SPRUNG", // Mobj was already sprung this tic
"APPLYPMOMZ", // Platform movement
NULL
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 3979b1304..e24b09652 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -232,8 +232,7 @@ typedef enum
MFE_VERTICALFLIP = 1<<5,
// Goo water
MFE_GOOWATER = 1<<6,
- // free: 1<<7
- MFE_DUMMY = 1<<7,
+ // free: to and including 1<<7
// Mobj was already sprung this tic
MFE_SPRUNG = 1<<8,
// Platform movement