zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 03:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed: GLDEFS DisableBrightMaps did not apply to HUD sprites.

Browse source 
* Updated to ZDoom r2462:
- Added automap enhancements but made the new key icon optional.
- Use side_t::RightSide in IterFindPolySides() instead of the SideListHead array.
- Added Pink Silver's DrawString/Number alignment patch (with one minor change).

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@855 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2010-07-25 22:56:01 +00:00
parent bad057fe55
commit fabdbd1706
8 changed files with 181 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/po_man.cpp
View file

@ -136,7 +136,7 @@ static void UnLinkPolyobj (FPolyObj *po);
static void LinkPolyobj (FPolyObj *po);
static bool CheckMobjBlocking (side_t *seg, FPolyObj *po);
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 TranslateToStartSpot (int tag, int originX, int originY);
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 ------------------------------------------------
static SDWORD *SideListHead; // contains numvertexes elements
static TArray<SDWORD> KnownPolySides;
// CODE --------------------------------------------------------------------
@ -1323,21 +1322,13 @@ static void InitBlockMap (void)
static void InitSideLists ()
{
SDWORD i;
SideListHead = new SDWORD[numvertexes];
clearbuf (SideListHead, numvertexes, -1);
for (i = 0; i < numsides; ++i)
for (int i = 0; i < numsides; ++i)
{
if (sides[i].linedef != NULL)
if (sides[i].linedef != NULL &&
(sides[i].linedef->special == Polyobj_StartLine ||
sides[i].linedef->special == Polyobj_ExplicitLine))
{
SideListHead[sides[i].V1() - vertexes] = i;
if ((sides[i].linedef->special == Polyobj_StartLine ||
sides[i].linedef->special == Polyobj_ExplicitLine))
{
KnownPolySides.Push (i);
}
KnownPolySides.Push (i);
}
}
}
@ -1350,8 +1341,6 @@ static void InitSideLists ()
static void KillSideLists ()
{
delete[] SideListHead;
SideListHead = NULL;
KnownPolySides.Clear ();
KnownPolySides.ShrinkToFit ();
}
@ -1375,9 +1364,9 @@ static void IterFindPolySides (FPolyObj *po, side_t *side)
for (i = 0; i < numsides; i++)
{
int v2 = int(side->V2() - vertexes);
j = SideListHead[v2];
j = side->RightSide;
if (j < 0)
if (j == NO_SIDE)
{
break;
}