From eef1406bd8700baa9103fc26e51aa6c2c0fabd60 Mon Sep 17 00:00:00 2001
From: MonsterIestyn <iestynjealous@ntlworld.com>
Date: Thu, 22 Jan 2015 19:24:40 +0000
Subject: [PATCH] WARNING: I HAVE PROBABLY JUST BROKEN 3/4 OF THE GAME WITH
THIS COMMIT PolyObject setup is now much simplified: First line alone spawns
a PolyObject, PolyObject Params apply extra settings Disabled Explicitly
Include Line for the meantime, since goodness knows how anyone's supposed to
use that at all (let alone working properly) Starting translucencies from PO
Params is stored for reference in netgames
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9000 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
---
src/p_polyobj.c | 95 ++++++++++++++++++++++++-------------------------
src/p_polyobj.h | 5 +--
src/p_saveg.c | 2 +-
3 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 9c955c97be..6e908bf09a 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -239,24 +239,39 @@ boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox)
//
// Polyobj_GetInfo
//
-// Finds the 'polyobject settings' linedef that shares the same tag
-// as the polyobj linedef to get the settings for it.
+// Finds the 'polyobject settings' linedef for a polyobject
+// the polyobject's id should be set as its tag
//
-void Polyobj_GetInfo(INT16 tag, INT32 *polyID, INT32 *mirrorID, UINT16 *exparg)
+void Polyobj_GetInfo(INT16 poid, INT32 *poflags, INT32 *parentID, INT32 *potrans)
{
- INT32 i = P_FindSpecialLineFromTag(POLYINFO_SPECIALNUM, tag, -1);
+ INT32 i = P_FindSpecialLineFromTag(POLYINFO_SPECIALNUM, poid, -1);
if (i == -1)
- I_Error("Polyobject (tag: %d) needs line %d for information.\n", tag, POLYINFO_SPECIALNUM);
+ return; // no extra settings to apply, let's leave it
- if (polyID)
- *polyID = lines[i].frontsector->floorheight>>FRACBITS;
+ if (parentID)
+ *parentID = lines[i].frontsector->special;
- if (mirrorID)
- *mirrorID = lines[i].frontsector->special;
+ if (potrans)
+ *potrans = (lines[i].frontsector->floorheight>>FRACBITS) / 100;
- if (exparg)
- *exparg = (UINT16)lines[i].frontsector->lightlevel;
+ if (lines[i].flags & ML_EFFECT1)
+ *poflags |= POF_ONESIDE;
+
+ if (lines[i].flags & ML_EFFECT2)
+ *poflags &= ~POF_SOLID;
+
+ if (lines[i].flags & ML_EFFECT3)
+ *poflags |= POF_PUSHABLESTOP;
+
+ if (lines[i].flags & ML_EFFECT4)
+ *poflags |= POF_RENDERPLANES;
+
+ /*if (lines[i].flags & ML_EFFECT5)
+ *poflags &= ~POF_CLIPPLANES;*/
+
+ if (lines[i].flags & ML_NOCLIMB) // Has a linedef executor
+ *poflags |= POF_LDEXEC;
}
// Reallocating array maintenance
@@ -478,6 +493,7 @@ newseg:
CONS_Debug(DBG_POLYOBJ, "Polyobject %d is not closed\n", po->id);
}
+/*
// structure used to store segs during explicit search process
typedef struct segitem_s
{
@@ -553,7 +569,7 @@ static void Polyobj_findExplicit(polyobj_t *po)
// free the temporary array
Z_Free(segitems);
-}
+}*/
// Setup functions
@@ -591,47 +607,27 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
for (i = 0; i < numsegs; ++i)
{
seg_t *seg = &segs[i];
- INT32 polyID, parentID;
+ INT32 poflags = POF_SOLID|POF_TESTHEIGHT|POF_RENDERSIDES;
+ INT32 parentID = 0, potrans = 0;
if (seg->linedef->special != POLYOBJ_START_LINE)
continue;
+
+ if (seg->linedef->tag != po->id)
+ continue;
- Polyobj_GetInfo(seg->linedef->tag, &polyID, &parentID, NULL);
-
- // is it a START line with this polyobject's id?
- if (polyID == po->id)
- {
- po->flags = POF_SOLID|POF_TESTHEIGHT|POF_RENDERSIDES;
-
- if (seg->linedef->flags & ML_EFFECT1)
- po->flags |= POF_ONESIDE;
-
- if (seg->linedef->flags & ML_EFFECT2)
- po->flags &= ~POF_SOLID;
-
- if (seg->linedef->flags & ML_EFFECT3)
- po->flags |= POF_PUSHABLESTOP;
-
- if (seg->linedef->flags & ML_EFFECT4)
- po->flags |= POF_RENDERPLANES;
-
- // TODO: Use a different linedef flag for this if we really need it!!
- // This clashes with texture tiling, also done by Effect 5 flag
- /*if (seg->linedef->flags & ML_EFFECT5)
- po->flags &= ~POF_CLIPPLANES;*/
-
- if (seg->linedef->flags & ML_NOCLIMB) // Has a linedef executor
- po->flags |= POF_LDEXEC;
-
- po->spawnflags = po->flags; // save original flags to reference later for netgames!
+ Polyobj_GetInfo(po->id, &poflags, &parentID, &potrans); // apply extra settings if they exist!
+
+ // save original flags and translucency to reference later for netgames!
+ po->spawnflags = po->flags = poflags;
+ po->spawntrans = po->translucency = potrans;
- Polyobj_findSegs(po, seg);
- po->parent = parentID;
- if (po->parent == po->id) // do not allow a self-reference
- po->parent = -1;
- // TODO: sound sequence is in args[2]
- break;
- }
+ Polyobj_findSegs(po, seg);
+ po->parent = parentID;
+ if (po->parent == po->id) // do not allow a self-reference
+ po->parent = -1;
+ // TODO: sound sequence is in args[2]
+ break;
}
CONS_Debug(DBG_POLYOBJ, "PO ID: %d; Num verts: %s\n", po->id, sizeu1(po->numVertices));
@@ -640,6 +636,7 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
if (po->isBad)
return;
+ /*
// 2. If no such line existed in the first step, look for a seg with the
// "explicit" special with tag matching this polyobject's id number. If
// found, continue to search for all such lines, storing them in a
@@ -658,7 +655,7 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
if (po->parent == po->id) // do not allow a self-reference
po->parent = -1;
// TODO: sound sequence is in args[3]
- }
+ }*/
// set the polyobject's spawn spot
diff --git a/src/p_polyobj.h b/src/p_polyobj.h
index 71cf965e3b..b42f8b98b7 100644
--- a/src/p_polyobj.h
+++ b/src/p_polyobj.h
@@ -28,7 +28,7 @@
#define POLYOBJ_ANCHOR_DOOMEDNUM 760
#define POLYOBJ_SPAWN_DOOMEDNUM 761
-#define POLYOBJ_SPAWNCRUSH_DOOMEDNUM 762
+#define POLYOBJ_SPAWNCRUSH_DOOMEDNUM 762 // todo: REMOVE
#define POLYOBJ_START_LINE 20
#define POLYOBJ_EXPLICIT_LINE 21
@@ -102,6 +102,7 @@ typedef struct polyobj_s
// these are saved for netgames, so do not let Lua touch these!
INT32 spawnflags; // Flags the polyobject originally spawned with
+ INT32 spawntrans; // Translucency the polyobject originally spawned with
} polyobj_t;
//
@@ -274,7 +275,7 @@ boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y);
boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo);
boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo);
boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox);
-void Polyobj_GetInfo(INT16 tag, INT32 *polyID, INT32 *parentID, UINT16 *exparg);
+void Polyobj_GetInfo(INT16 poid, INT32 *poflags, INT32 *parentID, INT32 *potrans);
// thinkers (needed in p_saveg.c)
void T_PolyObjRotate(polyrotate_t *);
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 9f15e90b4b..8f91c9ac92 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2798,7 +2798,7 @@ static inline void P_ArchivePolyObj(polyobj_t *po)
if (po->flags != po->spawnflags)
diff |= PD_FLAGS;
- if (po->translucency != 0)
+ if (po->translucency != po->spawntrans)
diff |= PD_TRANS;
WRITEUINT8(save_p, diff);
--
GitLab