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

Fixes (?) the issue with the player dying when falling into water sometimes. I don't know what the significance of this check is -- it looks like a typo.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1001 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-08-23 00:42:16 +00:00
parent 37767e0caf
commit 045151bb13
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/source/player.c
View file

@ -3330,18 +3330,15 @@ void processinput(int snum)
shrunk = (s->yrepeat < 32); shrunk = (s->yrepeat < 32);
getzrange(p->posx,p->posy,p->posz,psect,&cz,&hz,&fz,&lz,163L,CLIPMASK0); getzrange(p->posx,p->posy,p->posz,psect,&cz,&hz,&fz,&lz,163L,CLIPMASK0);
/*
j = getflorzofslope(psect,p->posx,p->posy);
p->truefz = j;
p->truecz = getceilzofslope(psect,p->posx,p->posy);
*/
getzsofslope(psect,p->posx,p->posy,&p->truecz,&p->truefz); getzsofslope(psect,p->posx,p->posy,&p->truecz,&p->truefz);
j = p->truefz; j = p->truefz;
truefdist = klabs(p->posz-j); truefdist = klabs(p->posz-j);
/* wtf is this supposed to do?
if ((lz&49152) == 16384 && psectlotag == 1 && truefdist > PHEIGHT+(16<<8)) if ((lz&49152) == 16384 && psectlotag == 1 && truefdist > PHEIGHT+(16<<8))
psectlotag = 0; psectlotag = 0;
*/
hittype[pi].floorz = fz; hittype[pi].floorz = fz;
hittype[pi].ceilingz = cz; hittype[pi].ceilingz = cz;

3
polymer/eduke32/source/sector.c
View file

@ -2649,9 +2649,10 @@ void sharedkeys(int snum)
{ {
p->steroids_amount--; p->steroids_amount--;
spritesound(DUKE_TAKEPILLS,p->i); spritesound(DUKE_TAKEPILLS,p->i);
p->inven_icon = 2;
FTA(12,p); FTA(12,p);
} }
if (p->steroids_amount > 0)
p->inven_icon = 2;
} }
return; // is there significance to returning? return; // is there significance to returning?
} }