From 2f5a8a0f6b4786c020b873e7cd0e86cc5ec69e96 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Mon, 7 Mar 2011 22:56:00 +0000 Subject: [PATCH] minor fixes git-svn-id: https://svn.eduke32.com/eduke32@1833 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/build.c | 5 ++--- polymer/eduke32/source/astub.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index 703c5db8d..10900e176 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -1864,14 +1864,13 @@ static void updatesprite1(int16_t i) { setsprite(i, (vec3_t *)&sprite[i]); - if ((sprite[i].cstat&48)!=32 && sprite[i].sectnum>=0) + if (sprite[i].sectnum>=0) { int32_t tempint, cz, fz; tempint = spriteheight(i, NULL); if (sprite[i].cstat&128) tempint >>= 1; - cz = getceilzofslope(sprite[i].sectnum, sprite[i].x,sprite[i].y); - fz = getflorzofslope(sprite[i].sectnum, sprite[i].x,sprite[i].y); + getzsofslope(sprite[i].sectnum, sprite[i].x, sprite[i].y, &cz, &fz); sprite[i].z = max(sprite[i].z, cz+tempint); sprite[i].z = min(sprite[i].z, fz); } diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index c56ace785..5a6f2e28d 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -853,8 +853,8 @@ const char *SectorEffectorTagText(int32_t lotag) "CONVAYER BELT", "ENGINE", // 25 "(UNKNOWN)", - "LIGHTNING (H= TILE#4890)", "CAMERA FOR PLAYBACK", + "LIGHTNING (H= TILE#4890)", "FLOAT", "2 WAY TRAIN (ST=31)", // 30 "FLOOR RISE",