From f3e66dddcb02a01cde6aa103c1ffc9a3311cdfa0 Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 19 Jan 2009 06:41:28 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@1217 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/build.c | 8 ++++---- polymer/eduke32/build/src/engine.c | 2 +- polymer/eduke32/source/astub.c | 2 +- polymer/eduke32/source/gameexec.c | 10 ++++++++++ polymer/eduke32/source/global.c | 2 +- polymer/eduke32/source/premap.c | 6 ++++-- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index 2ed6fcf61..4048f9364 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -944,12 +944,12 @@ void editinput(void) if (hitinfo.hitsect >= 0) { dax = hitinfo.pos.x; - day = hitinfo.pos.x; + day = hitinfo.pos.y; if ((gridlock > 0) && (grid > 0)) { if ((searchstat == 0) || (searchstat == 4)) { - hitinfo.pos.y = (hitinfo.pos.y&0xfffffc00); + hitinfo.pos.z = (hitinfo.pos.z&0xfffffc00); } else { @@ -1012,11 +1012,11 @@ void editinput(void) j = ((tilesizy[sprite[i].picnum]*sprite[i].yrepeat)<<1); if ((sprite[i].cstat&128) == 0) - sprite[i].z = min(max(hitinfo.pos.y, + sprite[i].z = min(max(hitinfo.pos.z, getceilzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)+(j<<1)), getflorzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)); else - sprite[i].z = min(max(hitinfo.pos.y, + sprite[i].z = min(max(hitinfo.pos.z, getceilzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)+j), getflorzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)-j); diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index 0d4b1a156..0f0cfe961 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -573,7 +573,7 @@ static char coldist[8] = {0,1,2,3,4,3,2,1}; static int32_t colscan[27]; static int16_t clipnum, hitwalls[4]; -int32_t hitscangoalx = (1<<29)-1, hitscangoaly = (1<<29)-1; +const int32_t hitscangoalx = (1<<29)-1, hitscangoaly = (1<<29)-1; #ifdef POLYMOST int32_t hitallsprites = 0; #endif diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 327042612..e0e1896c0 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif -#define BUILDDATE " 20090117" +#define BUILDDATE " 20090118" #define VERSION " 1.2.0devel" static int32_t floor_over_floor; diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 7115b5a2c..b9df7a283 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -273,6 +273,9 @@ void A_GetZLimits(int32_t iActor) if (s->statnum == 10 || s->statnum == 6 || s->statnum == 2 || s->statnum == 1 || s->statnum == 4) { int32_t hz,lz,zr = 127L; + int32_t cstat = s->cstat; + + s->cstat = 0; if (s->statnum == 4) zr = 4L; @@ -281,6 +284,8 @@ void A_GetZLimits(int32_t iActor) getzrange((vec3_t *)s,s->sectnum,&ActorExtra[iActor].ceilingz,&hz,&ActorExtra[iActor].floorz,&lz,zr,CLIPMASK0); s->z += FOURSLEIGHT; + s->cstat = cstat; + if ((lz&49152) == 49152 && (sprite[lz&(MAXSPRITES-1)].cstat&48) == 0) { lz &= (MAXSPRITES-1); @@ -329,9 +334,12 @@ void A_Fall(int32_t iActor) if ((s->statnum == 1 || s->statnum == 10 || s->statnum == 2 || s->statnum == 6)) { + int32_t cstat = s->cstat; + s->cstat = 0; s->z -= FOURSLEIGHT; getzrange((vec3_t *)s,s->sectnum,&ActorExtra[iActor].ceilingz,&hz,&ActorExtra[iActor].floorz,&lz,127L,CLIPMASK0); s->z += FOURSLEIGHT; + s->cstat = cstat; } else { @@ -2968,8 +2976,10 @@ static int32_t X_DoExecute(void) case CON_IFGAPZL: insptr++; X_DoConditional(((ActorExtra[vm.g_i].floorz - ActorExtra[vm.g_i].ceilingz) >> 8) < *insptr); +/* if (sprite[vm.g_i].sectnum == g_player[vm.g_p].ps->cursectnum) OSD_Printf("%d %d\n",ActorExtra[vm.g_i].floorz,ActorExtra[vm.g_i].ceilingz); +*/ break; case CON_IFHITSPACE: diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c index b860b094d..5b14edc23 100644 --- a/polymer/eduke32/source/global.c +++ b/polymer/eduke32/source/global.c @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //------------------------------------------------------------------------- #include "duke3d.h" -const char *s_buildDate = "20090117"; +const char *s_buildDate = "20090118"; char *MusicPtr = NULL; int32_t g_musicSize; diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index c86ce09ba..9f9f16dfc 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -520,8 +520,10 @@ void G_CacheMapData(void) } if (totalclock - tc > TICRATE/4) { - sprintf(tempbuf,"%d resources remaining\n",g_precacheCount-pc+1); - G_DoLoadScreen(tempbuf, min(100,100*pc/g_precacheCount)); + /*Bsprintf(tempbuf,"%d resources remaining\n",g_precacheCount-pc+1);*/ + tc = min(100,100*pc/g_precacheCount); + Bsprintf(tempbuf,"Loaded %d%% (%d/%d textures)\n",tc,pc,g_precacheCount); + G_DoLoadScreen(tempbuf, tc); tc = totalclock; } }