From 045151bb135d349277a5c3698485c6d899867db5 Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 23 Aug 2008 00:42:16 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.eduke32.com/eduke32@1001 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 9 +++------ polymer/eduke32/source/sector.c | 3 ++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 67c8fec17..d674797db 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -3330,18 +3330,15 @@ void processinput(int snum) shrunk = (s->yrepeat < 32); 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); j = p->truefz; truefdist = klabs(p->posz-j); + + /* wtf is this supposed to do? if ((lz&49152) == 16384 && psectlotag == 1 && truefdist > PHEIGHT+(16<<8)) psectlotag = 0; + */ hittype[pi].floorz = fz; hittype[pi].ceilingz = cz; diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c index 93621917d..646e89d3c 100644 --- a/polymer/eduke32/source/sector.c +++ b/polymer/eduke32/source/sector.c @@ -2649,9 +2649,10 @@ void sharedkeys(int snum) { p->steroids_amount--; spritesound(DUKE_TAKEPILLS,p->i); - p->inven_icon = 2; FTA(12,p); } + if (p->steroids_amount > 0) + p->inven_icon = 2; } return; // is there significance to returning? }