From 1aa90754db8a59b4dd9a552632f1b131e9fe5c73 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sun, 26 Apr 2020 10:33:13 +0200
Subject: [PATCH] Port over raise thinker changes from next (preparation for
merge)
---
src/p_saveg.c | 41 +++++++++++++++++++++++++++++++++++++++--
src/p_spec.c | 46 ++++++++++++++++------------------------------
src/p_spec.h | 22 +++++++++++++++++++++-
3 files changed, 76 insertions(+), 33 deletions(-)
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 23407b2b1f..f9ab4d83ca 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1766,6 +1766,24 @@ static void SaveThwompThinker(const thinker_t *th, const UINT8 type)
WRITEUINT16(save_p, ht->sound);
}
+// SaveRaiseThinker
+//
+// Saves a raise_t thinker
+//
+static void SaveRaiseThinker(const thinker_t *th, const UINT8 type)
+{
+ const raise_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEFIXED(save_p, ht->ceilingbottom);
+ WRITEFIXED(save_p, ht->ceilingtop);
+ WRITEFIXED(save_p, ht->basespeed);
+ WRITEFIXED(save_p, ht->extraspeed);
+ WRITEUINT8(save_p, ht->shaketimer);
+ WRITEUINT8(save_p, ht->flags);
+}
+
//
// SaveCeilingThinker
//
@@ -2344,7 +2362,7 @@ static void P_NetArchiveThinkers(void)
}
else if (th->function.acp1 == (actionf_p1)T_RaiseSector)
{
- SaveSpecialLevelThinker(th, tc_raisesector);
+ SaveRaiseThinker(th, tc_raisesector);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_CameraScanner)
@@ -2898,6 +2916,25 @@ static thinker_t* LoadThwompThinker(actionf_p1 thinker)
return &ht->thinker;
}
+// LoadRaiseThinker
+//
+// Loads a raise_t from a save game
+//
+static thinker_t* LoadRaiseThinker(actionf_p1 thinker)
+{
+ raise_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->ceilingbottom = READFIXED(save_p);
+ ht->ceilingtop = READFIXED(save_p);
+ ht->basespeed = READFIXED(save_p);
+ ht->extraspeed = READFIXED(save_p);
+ ht->shaketimer = READUINT8(save_p);
+ ht->flags = READUINT8(save_p);
+ return &ht->thinker;
+}
+
//
// LoadCeilingThinker
//
@@ -3576,7 +3613,7 @@ static void P_NetUnArchiveThinkers(void)
break;
case tc_raisesector:
- th = LoadSpecialLevelThinker((actionf_p1)T_RaiseSector, 0);
+ th = LoadRaiseThinker((actionf_p1)T_RaiseSector);
break;
/// \todo rewrite all the code that uses an elevator_t but isn't an elevator
diff --git a/src/p_spec.c b/src/p_spec.c
index 7c968f3760..6ffb56776c 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -6050,42 +6050,28 @@ static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
* \sa P_SpawnSpecials, T_RaiseSector
* \author SSNTails <http://www.ssntails.org>
*/
-static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline)
+static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline, boolean lower, boolean spindash)
{
- levelspecthink_t *raise;
+ raise_t *raise;
raise = Z_Calloc(sizeof (*raise), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &raise->thinker);
raise->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
- if (sourceline->flags & ML_BLOCKMONSTERS)
- raise->vars[0] = 1;
- else
- raise->vars[0] = 0;
-
// set up the fields
+ raise->sourceline = sourceline;
raise->sector = sec;
- // Require a spindash to activate
- if (sourceline->flags & ML_NOCLIMB)
- raise->vars[1] = 1;
- else
- raise->vars[1] = 0;
-
- raise->vars[2] = P_AproxDistance(sourceline->dx, sourceline->dy);
- raise->vars[2] = FixedDiv(raise->vars[2], 4*FRACUNIT);
- raise->vars[3] = raise->vars[2];
+ raise->ceilingtop = P_FindHighestCeilingSurrounding(sec);
+ raise->ceilingbottom = P_FindLowestCeilingSurrounding(sec);
- raise->vars[5] = P_FindHighestCeilingSurrounding(sec);
- raise->vars[4] = raise->vars[5]
- - (sec->ceilingheight - sec->floorheight);
+ raise->basespeed = FixedDiv(P_AproxDistance(sourceline->dx, sourceline->dy), 4*FRACUNIT);
- raise->vars[7] = P_FindLowestCeilingSurrounding(sec);
- raise->vars[6] = raise->vars[7]
- - (sec->ceilingheight - sec->floorheight);
-
- raise->sourceline = sourceline;
+ if (lower)
+ raise->flags |= RF_REVERSE;
+ if (spindash)
+ raise->flags |= RF_SPINDASH;
}
static void P_AddAirbob(sector_t *sec, line_t *sourceline, fixed_t dist, boolean raise, boolean dynamic, boolean spindash)
@@ -6856,22 +6842,22 @@ void P_SpawnSpecials(boolean fromnetsave)
case 190: // Rising Platform FOF (solid, opaque, shadows)
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
case 191: // Rising Platform FOF (solid, opaque, no shadows)
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_CUTLEVEL, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
case 192: // Rising Platform TL block: FOF (solid, translucent)
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
case 193: // Rising Platform FOF (solid, invisible)
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_NOSHADE, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
case 194: // Rising Platform 'Platform' - You can jump up through it
@@ -6881,7 +6867,7 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags |= FF_NOSHADE;
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
case 195: // Rising Platform Translucent "platform"
@@ -6891,7 +6877,7 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags |= FF_NOSHADE;
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
case 200: // Light block
diff --git a/src/p_spec.h b/src/p_spec.h
index 083cd0ce6d..06d4ad2660 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -398,6 +398,26 @@ typedef struct
UINT16 sound;
} thwomp_t;
+typedef enum
+{
+ RF_REVERSE = 1, //Lower when stood on
+ RF_SPINDASH = 1<<1, //Require spindash to move
+ RF_DYNAMIC = 1<<2, //Dynamically sinking platform
+} raiseflag_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline;
+ sector_t *sector;
+ fixed_t ceilingbottom;
+ fixed_t ceilingtop;
+ fixed_t basespeed;
+ fixed_t extraspeed; //For dynamically sinking platform
+ UINT8 shaketimer; //For dynamically sinking platform
+ UINT8 flags;
+} raise_t;
+
#define ELEVATORSPEED (FRACUNIT*4)
#define FLOORSPEED (FRACUNIT)
@@ -437,7 +457,7 @@ void T_ThwompSector(thwomp_t *thwomp);
void T_NoEnemiesSector(levelspecthink_t *nobaddies);
void T_EachTimeThinker(levelspecthink_t *eachtime);
void T_CameraScanner(elevator_t *elevator);
-void T_RaiseSector(levelspecthink_t *sraise);
+void T_RaiseSector(raise_t *raise);
typedef struct
{
--
GitLab