From b9d89d59f53e7e7c1bf32aac9e2f0b389fd65f11 Mon Sep 17 00:00:00 2001
From: Anton Retro Jr <forgetboutitluigi@gmail.com>
Date: Tue, 12 Jul 2022 16:22:39 +0000
Subject: [PATCH] Undo the accidental damage to the structure of deh_tables.c
---
src/deh_tables.c | 48 ++++++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 3faff18914..51dab1b99d 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -91,6 +91,8 @@ actionpointer_t actionpointers[] =
{{A_FaceTracer}, "A_FACETRACER"},
{{A_Scream}, "A_SCREAM"},
{{A_BossDeath}, "A_BOSSDEATH"},
+ {{A_SetShadowScale}, "A_SETSHADOWSCALE"},
+ {{A_ShadowScream}, "A_SHADOWSCREAM"},
{{A_CustomPower}, "A_CUSTOMPOWER"},
{{A_GiveWeapon}, "A_GIVEWEAPON"},
{{A_RingBox}, "A_RINGBOX"},
@@ -197,6 +199,7 @@ actionpointer_t actionpointers[] =
{{A_Boss3Path}, "A_BOSS3PATH"},
{{A_Boss3ShockThink}, "A_BOSS3SHOCKTHINK"},
{{A_LinedefExecute}, "A_LINEDEFEXECUTE"},
+ {{A_LinedefExecuteFromArg}, "A_LINEDEFEXECUTEFROMARG"},
{{A_PlaySeeSound}, "A_PLAYSEESOUND"},
{{A_PlayAttackSound}, "A_PLAYATTACKSOUND"},
{{A_PlayActiveSound}, "A_PLAYACTIVESOUND"},
@@ -4169,17 +4172,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
"MT_FINISHFLAG", // Finish flag
// Ambient Sounds
- "MT_AWATERA", // Ambient Water Sound 1
- "MT_AWATERB", // Ambient Water Sound 2
- "MT_AWATERC", // Ambient Water Sound 3
- "MT_AWATERD", // Ambient Water Sound 4
- "MT_AWATERE", // Ambient Water Sound 5
- "MT_AWATERF", // Ambient Water Sound 6
- "MT_AWATERG", // Ambient Water Sound 7
- "MT_AWATERH", // Ambient Water Sound 8
- "MT_RANDOMAMBIENT",
- "MT_RANDOMAMBIENT2",
- "MT_MACHINEAMBIENCE",
+ "MT_AMBIENT",
"MT_CORK",
"MT_LHRT",
@@ -4283,7 +4276,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
"MT_CRUMBLEOBJ", // Sound generator for crumbling platform
"MT_TUBEWAYPOINT",
"MT_PUSH",
- "MT_PULL",
"MT_GHOST",
"MT_OVERLAY",
"MT_ANGLEMAN",
@@ -4520,23 +4512,24 @@ const char *const GAMETYPERULE_LIST[] = {
};
// Linedef flags
-const char *const ML_LIST[16] = {
+const char *const ML_LIST[] = {
"IMPASSIBLE",
"BLOCKMONSTERS",
"TWOSIDED",
"DONTPEGTOP",
"DONTPEGBOTTOM",
- "EFFECT1",
+ "SKEWTD",
"NOCLIMB",
- "EFFECT2",
- "EFFECT3",
- "EFFECT4",
- "EFFECT5",
- "NOSONIC",
- "NOTAILS",
- "NOKNUX",
+ "NOSKEW",
+ "MIDPEG",
+ "MIDSOLID",
+ "WRAPMIDTEX",
+ "NETONLY",
+ "NONET",
+ "EFFECT6",
"BOUNCY",
- "TFERLINE"
+ "TFERLINE",
+ NULL
};
// Sector flags
@@ -5371,6 +5364,17 @@ struct int_const_s const INT_CONST[] = {
{"FF_BOUNCY",FF_BOUNCY}, ///< Bounces players
{"FF_SPLAT",FF_SPLAT}, ///< Use splat flat renderer (treat cyan pixels as invisible)
+ // FOF bustable flags
+ {"FB_PUSHABLES",FB_PUSHABLES},
+ {"FB_EXECUTOR",FB_EXECUTOR},
+ {"FB_ONLYBOTTOM",FB_ONLYBOTTOM},
+
+ // Bustable FOF type
+ {"BT_TOUCH",BT_TOUCH},
+ {"BT_SPINBUST",BT_SPINBUST},
+ {"BT_REGULAR",BT_REGULAR},
+ {"BT_STRONG",BT_STRONG},
+
// PolyObject flags
{"POF_CLIPLINES",POF_CLIPLINES}, ///< Test against lines for collision
{"POF_CLIPPLANES",POF_CLIPPLANES}, ///< Test against tops and bottoms for collision
--
GitLab