zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 13:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use side_t::RightSide in IterFindPolySides() instead of the SideListHead array.

Browse source 
SVN r2461 (trunk)
This commit is contained in:
Randy Heit 2010-07-25 21:38:34 +00:00
parent 006fb343b0
commit 1bda16cc45
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/po_man.cpp
View file

@ -136,7 +136,7 @@ static void UnLinkPolyobj (FPolyObj *po);
static void LinkPolyobj (FPolyObj *po); static void LinkPolyobj (FPolyObj *po);
static bool CheckMobjBlocking (side_t *seg, FPolyObj *po); static bool CheckMobjBlocking (side_t *seg, FPolyObj *po);
static void InitBlockMap (void); static void InitBlockMap (void);
static void IterFindPolySides (vertex_t *v1, vertex_t *v2, seg_t **segList); static void IterFindPolySides (FPolyObj *po, side_t *side);
static void SpawnPolyobj (int index, int tag, int type); static void SpawnPolyobj (int index, int tag, int type);
static void TranslateToStartSpot (int tag, int originX, int originY); static void TranslateToStartSpot (int tag, int originX, int originY);
static void DoMovePolyobj (FPolyObj *po, int x, int y); static void DoMovePolyobj (FPolyObj *po, int x, int y);
@ -156,7 +156,6 @@ polyspawns_t *polyspawns; // [RH] Let P_SpawnMapThings() find our thingies for u
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
static SDWORD *SideListHead; // contains numvertexes elements
static TArray<SDWORD> KnownPolySides; static TArray<SDWORD> KnownPolySides;
// CODE -------------------------------------------------------------------- // CODE --------------------------------------------------------------------
@ -1323,24 +1322,16 @@ static void InitBlockMap (void)
static void InitSideLists () static void InitSideLists ()
{ {
SDWORD i; for (int i = 0; i < numsides; ++i)
SideListHead = new SDWORD[numvertexes];
clearbuf (SideListHead, numvertexes, -1);
for (i = 0; i < numsides; ++i)
{ {
if (sides[i].linedef != NULL) if (sides[i].linedef != NULL &&
{ (sides[i].linedef->special == Polyobj_StartLine ||
SideListHead[sides[i].V1() - vertexes] = i;
if ((sides[i].linedef->special == Polyobj_StartLine ||
sides[i].linedef->special == Polyobj_ExplicitLine)) sides[i].linedef->special == Polyobj_ExplicitLine))
{ {
KnownPolySides.Push (i); KnownPolySides.Push (i);
} }
} }
} }
}
//========================================================================== //==========================================================================
// //
@ -1350,8 +1341,6 @@ static void InitSideLists ()
static void KillSideLists () static void KillSideLists ()
{ {
delete[] SideListHead;
SideListHead = NULL;
KnownPolySides.Clear (); KnownPolySides.Clear ();
KnownPolySides.ShrinkToFit (); KnownPolySides.ShrinkToFit ();
} }
@ -1375,9 +1364,9 @@ static void IterFindPolySides (FPolyObj *po, side_t *side)
for (i = 0; i < numsides; i++) for (i = 0; i < numsides; i++)
{ {
int v2 = int(side->V2() - vertexes); int v2 = int(side->V2() - vertexes);
j = SideListHead[v2]; j = side->RightSide;
if (j < 0) if (j == NO_SIDE)
{ {
break; break;
} }