zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 13:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

TROR no-SE7 water: spawn splash, reuse calculated other sector number.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3683 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-04-15 10:48:20 +00:00
parent 73eb1c4def
commit 0db0587731
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
polymer/eduke32/source/actors.c
View file

@ -360,7 +360,8 @@ static int32_t A_CheckNoSE7Water(const spritetype *s, int32_t sectnum, int32_t s
// Returns: // Returns:
// 0 if no. // 0 if no.
// 1 if yes, but stayed inside [actor[].ceilingz+1, actor[].floorz]. // 1 if yes, but stayed inside [actor[].ceilingz+1, actor[].floorz].
// 2 if yes, but passed a TROR no-SE7 water boundary. // <0 if yes, but passed a TROR no-SE7 water boundary. -returnvalue-1 is the
// other-side sector number.
static int32_t A_CheckNeedZUpdate(int32_t spritenum, int32_t changez, int32_t *dazptr) static int32_t A_CheckNeedZUpdate(int32_t spritenum, int32_t changez, int32_t *dazptr)
{ {
const spritetype *spr = &sprite[spritenum]; const spritetype *spr = &sprite[spritenum];
@ -377,14 +378,20 @@ static int32_t A_CheckNeedZUpdate(int32_t spritenum, int32_t changez, int32_t *d
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
{ {
const int32_t psect=spr->sectnum, slotag=sector[psect].lotag; const int32_t psect=spr->sectnum, slotag=sector[psect].lotag;
int32_t othersect;
// Non-SE7 water. // Non-SE7 water.
// PROJECTILE_CHSECT // PROJECTILE_CHSECT
if ((changez < 0 && slotag==ST_2_UNDERWATER) || (changez > 0 && slotag==ST_1_ABOVE_WATER)) if ((changez < 0 && slotag==ST_2_UNDERWATER) || (changez > 0 && slotag==ST_1_ABOVE_WATER))
if (A_CheckNoSE7Water(spr, sprite[spritenum].sectnum, slotag, NULL)) if (A_CheckNoSE7Water(spr, sprite[spritenum].sectnum, slotag, &othersect))
{ {
A_Spawn(spritenum, WATERSPLASH2);
// NOTE: Don't tweak its z position afterwards like with
// SE7-induced projectile teleportation. It doesn't look good
// with TROR water.
actor[spritenum].flags |= SPRITE_DIDNOSE7WATER; actor[spritenum].flags |= SPRITE_DIDNOSE7WATER;
return 2; return -othersect-1;
} }
} }
#endif #endif
@ -496,13 +503,8 @@ int32_t A_MoveSprite(int32_t spritenum, const vec3_t *change, uint32_t cliptype)
{ {
spr->z = daz; spr->z = daz;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
if (dozupdate==2 || (yax_getbunch(dasectnum, (change->z>0))>=0 if (dozupdate < 0)
&& (SECTORFLD(dasectnum,stat, (change->z>0))&yax_waltosecmask(cliptype))==0))
{ {
// initprintf("spr %d, sect %d: chz=%d, cfz=[%d,%d]\n", spritenum, dasectnum, change->z,
// actor[spritenum].ceilingz, actor[spritenum].floorz);
setspritez(spritenum, (vec3_t *)spr);
// If we passed a TROR no-SE7 water boundary, signal to the outside // If we passed a TROR no-SE7 water boundary, signal to the outside
// that the ceiling/floor was not hit. However, this is not enough: // that the ceiling/floor was not hit. However, this is not enough:
// later, code checks for (retval&49152)!=49152 // later, code checks for (retval&49152)!=49152
@ -511,8 +513,14 @@ int32_t A_MoveSprite(int32_t spritenum, const vec3_t *change, uint32_t cliptype)
// actor[].flags |= SPRITE_DIDNOSE7WATER in A_CheckNeedZUpdate() // actor[].flags |= SPRITE_DIDNOSE7WATER in A_CheckNeedZUpdate()
// previously. // previously.
// XXX: Why is this contrived data flow necessary? (If at all.) // XXX: Why is this contrived data flow necessary? (If at all.)
if (dozupdate==2) changespritesect(spritenum, -dozupdate-1);
retval = 0; return 0;
}
if (yax_getbunch(dasectnum, (change->z>0))>=0
&& (SECTORFLD(dasectnum,stat, (change->z>0))&yax_waltosecmask(cliptype))==0)
{
setspritez(spritenum, (vec3_t *)spr);
} }
#endif #endif
} }