zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 06:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed merge.

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-12 18:32:11 +02:00
parent d466ea155f
commit 6be611fd94
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/duke/src/actors.cpp
View file

@ -1009,7 +1009,8 @@ void movemasterswitch(DDukeActor *actor, int spectype1, int spectype2)
// This originally depended on undefined behavior as the deleted sprite was still used for the sound // This originally depended on undefined behavior as the deleted sprite was still used for the sound
// with no checking if it got reused in the mean time. // with no checking if it got reused in the mean time.
spri->picnum = 0; // give it a picnum without any behavior attached, just in case spri->picnum = 0; // give it a picnum without any behavior attached, just in case
spri->cstat |= CSTAT_SPRITE_INVISIBLE|CSTAT_SPRITE_NOFIND; spri->cstat |= CSTAT_SPRITE_INVISIBLE;
spri->cstat2 |= CSTAT2_SPRITE_NOFIND;
changespritestat(actor, STAT_REMOVED); changespritestat(actor, STAT_REMOVED);
} }
} }
@ -4955,10 +4956,10 @@ void getglobalz(DDukeActor* actor)
zr = 4; zr = 4;
else zr = 127; else zr = 127;
auto cc = s->cstat; auto cc = s->cstat2;
s->cstat |= CSTAT_SPRITE_NOFIND; // don't clip against self. getzrange cannot detect this because it only receives a coordinate. s->cstat2 |= CSTAT2_SPRITE_NOFIND; // don't clip against self. getzrange cannot detect this because it only receives a coordinate.
getzrange_ex(s->x, s->y, s->z - (FOURSLEIGHT), s->sectnum, &actor->ceilingz, hz, &actor->floorz, lz, zr, CLIPMASK0); getzrange_ex(s->x, s->y, s->z - (FOURSLEIGHT), s->sectnum, &actor->ceilingz, hz, &actor->floorz, lz, zr, CLIPMASK0);
s->cstat = cc; s->cstat2 = cc;
if( lz.type == kHitSprite && (lz.actor->s->cstat&48) == 0 ) if( lz.type == kHitSprite && (lz.actor->s->cstat&48) == 0 )
{ {

3
source/games/duke/src/spawn.cpp
View file

@ -995,7 +995,8 @@ void spawneffector(DDukeActor* actor)
if (!found) if (!found)
{ {
sp->picnum = 0; sp->picnum = 0;
sp->cstat = CSTAT_SPRITE_NOFIND; sp->cstat2 = CSTAT2_SPRITE_NOFIND;
sp->cstat = CSTAT_SPRITE_INVISIBLE;
changespritesect(actor, STAT_REMOVED); changespritesect(actor, STAT_REMOVED);
Printf("Found lonely Sector Effector (lotag 0) at (%d,%d)\n", sp->x, sp->y); Printf("Found lonely Sector Effector (lotag 0) at (%d,%d)\n", sp->x, sp->y);
return; return;