zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-01 14:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- the rest of sectors.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-23 20:02:57 +02:00
parent 4236f800f6
commit ad84c8149e
4 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/funct.h
View file

@ -149,7 +149,7 @@ bool isablockdoor(int tileNum);
bool activatewarpelevators(DDukeActor* s, int w); bool activatewarpelevators(DDukeActor* s, int w);
int check_activator_motion(int lotag); int check_activator_motion(int lotag);
void operateactivators(int l, int w); void operateactivators(int l, int w);
void operateforcefields_common(int s, int low, const std::initializer_list<int>& tiles); void operateforcefields_common(DDukeActor* s, int low, const std::initializer_list<int>& tiles);
void operatemasterswitches(int lotag); void operatemasterswitches(int lotag);
void operatesectors(int s, DDukeActor* i); void operatesectors(int s, DDukeActor* i);
void hud_input(int playerNum); void hud_input(int playerNum);

25
source/games/duke/src/sectors.cpp
View file

@ -1173,7 +1173,7 @@ void operatemasterswitches(int low)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void operateforcefields_common(int s, int low, const std::initializer_list<int> &tiles) void operateforcefields_common(DDukeActor *effector, int low, const std::initializer_list<int> &tiles)
{ {
int i, p; int i, p;
@ -1190,8 +1190,7 @@ void operateforcefields_common(int s, int low, const std::initializer_list<int>
{ {
wall[i].cstat = 0; wall[i].cstat = 0;
if (s >= 0 && sprite[s].picnum == SECTOREFFECTOR && if (effector && effector->s.picnum == SECTOREFFECTOR && effector->s.lotag == 30)
sprite[s].lotag == 30)
wall[i].lotag = 0; wall[i].lotag = 0;
} }
else else
@ -1222,22 +1221,18 @@ void breakwall(short newpn, short spr, short dawallnum)
void allignwarpelevators(void) void allignwarpelevators(void)
{ {
int i, j; DukeStatIterator it(STAT_EFFECTOR);
while (auto act = it.Next())
StatIterator it(STAT_EFFECTOR);
while ((i = it.NextIndex()) >= 0)
{ {
auto si = &sprite[i]; if (act->s.lotag == SE_17_WARP_ELEVATOR && act->s.shade > 16)
if (si->lotag == SE_17_WARP_ELEVATOR && si->shade > 16)
{ {
StatIterator it1(STAT_EFFECTOR); DukeStatIterator it1(STAT_EFFECTOR);
while ((j = it1.NextIndex()) >= 0) while (auto act2 = it1.Next())
{ {
if ((sprite[j].lotag) == SE_17_WARP_ELEVATOR && i != j && if ((act2->s.lotag) == SE_17_WARP_ELEVATOR && act != act2 && act->s.hitag == act2->s.hitag)
(si->hitag) == (sprite[j].hitag))
{ {
sector[sprite[j].sectnum].floorz = sector[si->sectnum].floorz; sector[act2->s.sectnum].floorz = sector[act->s.sectnum].floorz;
sector[sprite[j].sectnum].ceilingz = sector[si->sectnum].ceilingz; sector[act2->s.sectnum].ceilingz = sector[act->s.sectnum].ceilingz;
} }
} }
} }

2
source/games/duke/src/sectors_d.cpp
View file

@ -214,7 +214,7 @@ void operaterespawns_d(int low)
void operateforcefields_d(int s, int low) void operateforcefields_d(int s, int low)
{ {
operateforcefields_common(s, low, { W_FORCEFIELD, W_FORCEFIELD + 1, W_FORCEFIELD + 2, BIGFORCE }); operateforcefields_common(&hittype[s], low, { W_FORCEFIELD, W_FORCEFIELD + 1, W_FORCEFIELD + 2, BIGFORCE });
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
source/games/duke/src/sectors_r.cpp
View file

@ -334,7 +334,7 @@ void operaterespawns_r(int low)
void operateforcefields_r(int s, int low) void operateforcefields_r(int s, int low)
{ {
operateforcefields_common(s, low, { BIGFORCE }); operateforcefields_common(&hittype[s], low, { BIGFORCE });
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------