- replaced P_FindSectorFromTag with an FSectorTagIterator class.
This is done to encapsulate the gory details of tag search in one place so that the implementation of multiple tags per sector remains contained to a few isolated spots in the code. This also moves the special 'tag == 0 -> activate backsector' handling into the iterator class.
This commit is contained in:
Christoph Oelckers
parent
7b4f950330
commit
425e5b9ffc
18 changed files with 354 additions and 329 deletions
|
|
@ -1914,9 +1914,9 @@ FUNC(LS_Sector_ChangeSound)
|
|||
if (!arg0)
|
||||
return false;
|
||||
|
||||
secNum = -1;
|
||||
rtn = false;
|
||||
while ((secNum = P_FindSectorFromTag (arg0, secNum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
while ((secNum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secNum].seqType = arg1;
|
||||
rtn = true;
|
||||
|
|
@ -1933,9 +1933,9 @@ FUNC(LS_Sector_ChangeFlags)
|
|||
if (!arg0)
|
||||
return false;
|
||||
|
||||
secNum = -1;
|
||||
rtn = false;
|
||||
while ((secNum = P_FindSectorFromTag (arg0, secNum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
while ((secNum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secNum].Flags = (sectors[secNum].Flags | arg1) & ~arg2;
|
||||
rtn = true;
|
||||
|
|
@ -1969,10 +1969,11 @@ void AdjustPusher (int tag, int magnitude, int angle, DPusher::EPusher type)
|
|||
}
|
||||
|
||||
size_t numcollected = Collection.Size ();
|
||||
int secnum = -1;
|
||||
int secnum;
|
||||
|
||||
// Now create pushers for any sectors that don't already have them.
|
||||
while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
|
||||
FSectorTagIterator itr(tag);
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
unsigned int i;
|
||||
for (i = 0; i < numcollected; i++)
|
||||
|
|
@ -2020,9 +2021,9 @@ FUNC(LS_Sector_SetTranslucent)
|
|||
{
|
||||
if (arg0 != 0)
|
||||
{
|
||||
int secnum = -1;
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
int secnum;
|
||||
FSectorTagIterator itr(arg0);
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].SetAlpha(arg1, Scale(arg2, OPAQUE, 255));
|
||||
sectors[secnum].ChangeFlags(arg1, ~PLANEF_ADDITIVE, arg3? PLANEF_ADDITIVE:0);
|
||||
|
|
@ -2037,7 +2038,7 @@ FUNC(LS_Sector_SetLink)
|
|||
{
|
||||
if (arg0 != 0) // control tag == 0 is for static initialization and must not be handled here
|
||||
{
|
||||
int control = P_FindSectorFromTag(arg0, -1);
|
||||
int control = P_FindFirstSectorFromTag(arg0);
|
||||
if (control >= 0)
|
||||
{
|
||||
return P_AddSectorLinks(§ors[control], arg1, arg2, arg3);
|
||||
|
|
@ -2181,7 +2182,8 @@ static void SetScroller (int tag, DScroller::EScrollType type, fixed_t dx, fixed
|
|||
}
|
||||
|
||||
// Need to create scrollers for the sector(s)
|
||||
for (i = -1; (i = P_FindSectorFromTag (tag, i)) >= 0; )
|
||||
FSectorTagIterator itr(tag);
|
||||
while ((i = itr.Next()) >= 0)
|
||||
{
|
||||
new DScroller (type, dx, dy, -1, i, 0);
|
||||
}
|
||||
|
|
@ -2240,8 +2242,10 @@ FUNC(LS_Sector_SetDamage)
|
|||
// problems by adding an unwanted constructor.
|
||||
// Since it doesn't really matter whether the type is translated
|
||||
// here or in P_PlayerInSpecialSector I think it's the best solution.
|
||||
int secnum = -1;
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0) {
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].damage = arg1;
|
||||
sectors[secnum].mod = arg2;
|
||||
}
|
||||
|
|
@ -2251,14 +2255,15 @@ FUNC(LS_Sector_SetDamage)
|
|||
FUNC(LS_Sector_SetGravity)
|
||||
// Sector_SetGravity (tag, intpart, fracpart)
|
||||
{
|
||||
int secnum = -1;
|
||||
float gravity;
|
||||
|
||||
if (arg2 > 99)
|
||||
arg2 = 99;
|
||||
gravity = (float)arg1 + (float)arg2 * 0.01f;
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
sectors[secnum].gravity = gravity;
|
||||
|
||||
return true;
|
||||
|
|
@ -2267,9 +2272,9 @@ FUNC(LS_Sector_SetGravity)
|
|||
FUNC(LS_Sector_SetColor)
|
||||
// Sector_SetColor (tag, r, g, b, desaturate)
|
||||
{
|
||||
int secnum = -1;
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].SetColor(arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
|
@ -2280,9 +2285,9 @@ FUNC(LS_Sector_SetColor)
|
|||
FUNC(LS_Sector_SetFade)
|
||||
// Sector_SetFade (tag, r, g, b)
|
||||
{
|
||||
int secnum = -1;
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].SetFade(arg1, arg2, arg3);
|
||||
}
|
||||
|
|
@ -2292,11 +2297,12 @@ FUNC(LS_Sector_SetFade)
|
|||
FUNC(LS_Sector_SetCeilingPanning)
|
||||
// Sector_SetCeilingPanning (tag, x-int, x-frac, y-int, y-frac)
|
||||
{
|
||||
int secnum = -1;
|
||||
fixed_t xofs = arg1 * FRACUNIT + arg2 * (FRACUNIT/100);
|
||||
fixed_t yofs = arg3 * FRACUNIT + arg4 * (FRACUNIT/100);
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].SetXOffset(sector_t::ceiling, xofs);
|
||||
sectors[secnum].SetYOffset(sector_t::ceiling, yofs);
|
||||
|
|
@ -2307,11 +2313,12 @@ FUNC(LS_Sector_SetCeilingPanning)
|
|||
FUNC(LS_Sector_SetFloorPanning)
|
||||
// Sector_SetFloorPanning (tag, x-int, x-frac, y-int, y-frac)
|
||||
{
|
||||
int secnum = -1;
|
||||
fixed_t xofs = arg1 * FRACUNIT + arg2 * (FRACUNIT/100);
|
||||
fixed_t yofs = arg3 * FRACUNIT + arg4 * (FRACUNIT/100);
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].SetXOffset(sector_t::floor, xofs);
|
||||
sectors[secnum].SetYOffset(sector_t::floor, yofs);
|
||||
|
|
@ -2322,7 +2329,6 @@ FUNC(LS_Sector_SetFloorPanning)
|
|||
FUNC(LS_Sector_SetFloorScale)
|
||||
// Sector_SetFloorScale (tag, x-int, x-frac, y-int, y-frac)
|
||||
{
|
||||
int secnum = -1;
|
||||
fixed_t xscale = arg1 * FRACUNIT + arg2 * (FRACUNIT/100);
|
||||
fixed_t yscale = arg3 * FRACUNIT + arg4 * (FRACUNIT/100);
|
||||
|
||||
|
|
@ -2331,7 +2337,9 @@ FUNC(LS_Sector_SetFloorScale)
|
|||
if (yscale)
|
||||
yscale = FixedDiv (FRACUNIT, yscale);
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
if (xscale)
|
||||
sectors[secnum].SetXScale(sector_t::floor, xscale);
|
||||
|
|
@ -2344,7 +2352,6 @@ FUNC(LS_Sector_SetFloorScale)
|
|||
FUNC(LS_Sector_SetCeilingScale)
|
||||
// Sector_SetCeilingScale (tag, x-int, x-frac, y-int, y-frac)
|
||||
{
|
||||
int secnum = -1;
|
||||
fixed_t xscale = arg1 * FRACUNIT + arg2 * (FRACUNIT/100);
|
||||
fixed_t yscale = arg3 * FRACUNIT + arg4 * (FRACUNIT/100);
|
||||
|
||||
|
|
@ -2353,7 +2360,9 @@ FUNC(LS_Sector_SetCeilingScale)
|
|||
if (yscale)
|
||||
yscale = FixedDiv (FRACUNIT, yscale);
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
if (xscale)
|
||||
sectors[secnum].SetXScale(sector_t::ceiling, xscale);
|
||||
|
|
@ -2366,14 +2375,14 @@ FUNC(LS_Sector_SetCeilingScale)
|
|||
FUNC(LS_Sector_SetFloorScale2)
|
||||
// Sector_SetFloorScale2 (tag, x-factor, y-factor)
|
||||
{
|
||||
int secnum = -1;
|
||||
|
||||
if (arg1)
|
||||
arg1 = FixedDiv (FRACUNIT, arg1);
|
||||
if (arg2)
|
||||
arg2 = FixedDiv (FRACUNIT, arg2);
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
if (arg1)
|
||||
sectors[secnum].SetXScale(sector_t::floor, arg1);
|
||||
|
|
@ -2386,14 +2395,14 @@ FUNC(LS_Sector_SetFloorScale2)
|
|||
FUNC(LS_Sector_SetCeilingScale2)
|
||||
// Sector_SetFloorScale2 (tag, x-factor, y-factor)
|
||||
{
|
||||
int secnum = -1;
|
||||
|
||||
if (arg1)
|
||||
arg1 = FixedDiv (FRACUNIT, arg1);
|
||||
if (arg2)
|
||||
arg2 = FixedDiv (FRACUNIT, arg2);
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
if (arg1)
|
||||
sectors[secnum].SetXScale(sector_t::ceiling, arg1);
|
||||
|
|
@ -2406,11 +2415,12 @@ FUNC(LS_Sector_SetCeilingScale2)
|
|||
FUNC(LS_Sector_SetRotation)
|
||||
// Sector_SetRotation (tag, floor-angle, ceiling-angle)
|
||||
{
|
||||
int secnum = -1;
|
||||
angle_t ceiling = arg2 * ANGLE_1;
|
||||
angle_t floor = arg1 * ANGLE_1;
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sectors[secnum].SetAngle(sector_t::floor, floor);
|
||||
sectors[secnum].SetAngle(sector_t::ceiling, ceiling);
|
||||
|
|
@ -2997,10 +3007,11 @@ FUNC(LS_ForceField)
|
|||
FUNC(LS_ClearForceField)
|
||||
// ClearForceField (tag)
|
||||
{
|
||||
int secnum = -1;
|
||||
bool rtn = false;
|
||||
|
||||
while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
|
||||
FSectorTagIterator itr(arg0);
|
||||
int secnum;
|
||||
while ((secnum = itr.Next()) >= 0)
|
||||
{
|
||||
sector_t *sec = §ors[secnum];
|
||||
rtn = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue