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

Fix handling of SE31 pointing upward. A bug was introduced in r2607.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3635 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-04-01 18:35:44 +00:00
parent 5b6b3c97e3
commit 385c582efa
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5423,7 +5423,7 @@ BOLT:
// i: SE spritenum // i: SE spritenum
static void HandleSE31(int32_t i, int32_t zref, int32_t t2val, int32_t movesignexp) static void HandleSE31(int32_t i, int32_t setfloorzp, int32_t zref, int32_t t2val, int32_t movesignexp)
{ {
const spritetype *s = &sprite[i]; const spritetype *s = &sprite[i];
sectortype *sc = &sector[sprite[i].sectnum]; sectortype *sc = &sector[sprite[i].sectnum];
@ -5431,6 +5431,7 @@ static void HandleSE31(int32_t i, int32_t zref, int32_t t2val, int32_t movesigne
if (klabs(sc->floorz - zref) < SP) if (klabs(sc->floorz - zref) < SP)
{ {
if (setfloorzp)
sc->floorz = zref; sc->floorz = zref;
t[2] = t2val; t[2] = t2val;
t[0] = 0; t[0] = 0;
@ -5449,6 +5450,7 @@ static void HandleSE31(int32_t i, int32_t zref, int32_t t2val, int32_t movesigne
if (sprite[j].picnum == APLAYER && sprite[j].owner >= 0) if (sprite[j].picnum == APLAYER && sprite[j].owner >= 0)
if (g_player[sprite[j].yvel].ps->on_ground == 1) if (g_player[sprite[j].yvel].ps->on_ground == 1)
g_player[sprite[j].yvel].ps->pos.z += l; g_player[sprite[j].yvel].ps->pos.z += l;
if (sprite[j].zvel == 0 && sprite[j].statnum != STAT_EFFECTOR && sprite[j].statnum != STAT_PROJECTILE) if (sprite[j].zvel == 0 && sprite[j].statnum != STAT_EFFECTOR && sprite[j].statnum != STAT_PROJECTILE)
{ {
actor[j].bpos.z = sprite[j].z += l; actor[j].bpos.z = sprite[j].z += l;
@ -7513,9 +7515,9 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (t[2] == 1) // Retract if (t[2] == 1) // Retract
{ {
if (SA != 1536) if (SA != 1536)
HandleSE31(i, s->z, 0, s->z-sc->floorz); HandleSE31(i, 1, s->z, 0, s->z-sc->floorz);
else else
HandleSE31(i, t[1], 0, t[1]-sc->floorz); HandleSE31(i, 1, t[1], 0, t[1]-sc->floorz);
Yax_SetBunchZs(sc-sector, YAX_FLOOR, sc->floorz); Yax_SetBunchZs(sc-sector, YAX_FLOOR, sc->floorz);
@ -7523,9 +7525,9 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
} }
if ((s->ang&2047) == 1536) if ((s->ang&2047) == 1536)
HandleSE31(i, s->z, 1, s->z-sc->floorz); HandleSE31(i, 0, s->z, 1, s->z-sc->floorz);
else else
HandleSE31(i, t[1], 1, t[1]-s->z); HandleSE31(i, 0, t[1], 1, t[1]-s->z);
Yax_SetBunchZs(sc-sector, YAX_FLOOR, sc->floorz); Yax_SetBunchZs(sc-sector, YAX_FLOOR, sc->floorz);
} }