zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: pull out some code from M32_InsertPoint() into M32_MarkPointInsertion().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5810 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2016-07-04 14:09:08 +00:00
parent edd7a82be8
commit eda5300b33
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
polymer/eduke32/build/src/build.c
View file

@ -2936,6 +2936,29 @@ static int32_t bakframe_fillandfade(char **origframeptr, int32_t sectnum, const
return ask_if_sure(querystr, 0); return ask_if_sure(querystr, 0);
} }
#ifdef YAX_ENABLE
static void M32_MarkPointInsertion(int32_t thewall)
{
int32_t i, tmpcf;
int32_t nextw = wall[thewall].nextwall;
// round 1
for (YAX_ITER_WALLS(thewall, i, tmpcf))
wall[i].cstat |= (1<<14);
if (nextw >= 0)
for (YAX_ITER_WALLS(nextw, i, tmpcf))
wall[i].cstat |= (1<<14);
// round 2 (enough?)
for (YAX_ITER_WALLS(thewall, i, tmpcf))
if (wall[i].nextwall >= 0 && (wall[wall[i].nextwall].cstat&(1<<14))==0)
wall[wall[i].nextwall].cstat |= (1<<14);
if (nextw >= 0)
for (YAX_ITER_WALLS(nextw, i, tmpcf))
if (wall[i].nextwall >= 0 && (wall[wall[i].nextwall].cstat&(1<<14))==0)
wall[wall[i].nextwall].cstat |= (1<<14);
}
#endif
// High-level insert point, handles TROR constrained walls too // High-level insert point, handles TROR constrained walls too
// onewnumwalls: old numwalls + drawn walls. // onewnumwalls: old numwalls + drawn walls.
// <mapwallnum>: see insertpoint() // <mapwallnum>: see insertpoint()
@ -2948,7 +2971,7 @@ static int32_t M32_InsertPoint(int32_t thewall, int32_t dax, int32_t day, int32_
{ {
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int32_t nextw = wall[thewall].nextwall; int32_t nextw = wall[thewall].nextwall;
int32_t i, j, k, m, tmpcf; int32_t i, j, k, m;
if (yax_islockedwall(thewall) || (nextw>=0 && yax_islockedwall(nextw))) if (yax_islockedwall(thewall) || (nextw>=0 && yax_islockedwall(nextw)))
{ {
@ -2956,20 +2979,7 @@ static int32_t M32_InsertPoint(int32_t thewall, int32_t dax, int32_t day, int32_
for (i=0; i<numwalls; i++) for (i=0; i<numwalls; i++)
wall[i].cstat &= ~(1<<14); wall[i].cstat &= ~(1<<14);
// round 1 M32_MarkPointInsertion(thewall);
for (YAX_ITER_WALLS(thewall, i, tmpcf))
wall[i].cstat |= (1<<14);
if (nextw >= 0)
for (YAX_ITER_WALLS(nextw, i, tmpcf))
wall[i].cstat |= (1<<14);
// round 2 (enough?)
for (YAX_ITER_WALLS(thewall, i, tmpcf))
if (wall[i].nextwall >= 0 && (wall[wall[i].nextwall].cstat&(1<<14))==0)
wall[wall[i].nextwall].cstat |= (1<<14);
if (nextw >= 0)
for (YAX_ITER_WALLS(nextw, i, tmpcf))
if (wall[i].nextwall >= 0 && (wall[wall[i].nextwall].cstat&(1<<14))==0)
wall[wall[i].nextwall].cstat |= (1<<14);
j = 0; j = 0;
for (i=0; i<numwalls; i++) for (i=0; i<numwalls; i++)