From 4b87bee759ce8e67069228688b7a32fab8f3c4b6 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sun, 3 May 2020 17:56:49 +0200
Subject: [PATCH] Add level header options for setting special stage time and
spheres requirements
---
src/dehacked.c | 4 ++++
src/doomstat.h | 2 ++
src/lua_maplib.c | 4 ++++
src/p_setup.c | 2 ++
src/p_spec.c | 4 ++--
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index e9d029be0b..c05a8f4441 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1863,6 +1863,10 @@ static void readlevelheader(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "STARTRINGS"))
mapheaderinfo[num-1]->startrings = (UINT16)i;
+ else if (fastcmp(word, "SPECIALSTAGETIME"))
+ mapheaderinfo[num-1]->sstimer = i;
+ else if (fastcmp(word, "SPECIALSTAGESPHERES"))
+ mapheaderinfo[num-1]->ssspheres = i;
else
deh_warning("Level header %d: unknown word '%s'", num, word);
}
diff --git a/src/doomstat.h b/src/doomstat.h
index aedb120ff2..e6a227a422 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -319,6 +319,8 @@ typedef struct
char selectheading[22]; ///< Level select heading. Allows for controllable grouping.
UINT16 startrings; ///< Number of rings players start with.
+ INT32 sstimer; ///< Timer for special stages.
+ UINT32 ssspheres; ///< Sphere requirement in special stages.
// Title card.
char ltzzpatch[8]; ///< Zig zag patch.
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index d851c820e5..1737216e37 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -2082,6 +2082,10 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->menuflags);
else if (fastcmp(field,"startrings"))
lua_pushinteger(L, header->startrings);
+ else if (fastcmp(field, "sstimer"))
+ lua_pushinteger(L, header->sstimer);
+ else if (fastcmp(field, "ssspheres"))
+ lua_pushinteger(L, header->ssspheres);
// TODO add support for reading numGradedMares and grades
else {
// Read custom vars now
diff --git a/src/p_setup.c b/src/p_setup.c
index b3b618e518..1d1826a539 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -218,6 +218,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->typeoflevel = 0;
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
mapheaderinfo[num]->startrings = 0;
+ mapheaderinfo[num]->sstimer = 90;
+ mapheaderinfo[num]->ssspheres = 1;
mapheaderinfo[num]->keywords[0] = '\0';
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
mapheaderinfo[num]->musname[6] = 0;
diff --git a/src/p_spec.c b/src/p_spec.c
index c93846438d..fafe2cdf3b 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -6249,8 +6249,8 @@ void P_InitSpecials(void)
gravity = FRACUNIT/2;
// Defaults in case levels don't have them set.
- sstimer = 90*TICRATE + 6;
- ssspheres = 1;
+ sstimer = mapheaderinfo[gamemap-1]->sstimer*TICRATE + 6;
+ ssspheres = mapheaderinfo[gamemap-1]->ssspheres;
CheckForBustableBlocks = CheckForBouncySector = CheckForQuicksand = CheckForMarioBlocks = CheckForFloatBob = CheckForReverseGravity = false;
--
GitLab