zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@1217 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2009-01-19 06:41:28 +00:00
parent 13f108ddd5
commit f3e66dddcb
6 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/build/src/build.c
View file

@ -944,12 +944,12 @@ void editinput(void)
if (hitinfo.hitsect >= 0) if (hitinfo.hitsect >= 0)
{ {
dax = hitinfo.pos.x; dax = hitinfo.pos.x;
day = hitinfo.pos.x; day = hitinfo.pos.y;
if ((gridlock > 0) && (grid > 0)) if ((gridlock > 0) && (grid > 0))
{ {
if ((searchstat == 0) || (searchstat == 4)) if ((searchstat == 0) || (searchstat == 4))
{ {
hitinfo.pos.y = (hitinfo.pos.y&0xfffffc00); hitinfo.pos.z = (hitinfo.pos.z&0xfffffc00);
} }
else else
{ {
@ -1012,11 +1012,11 @@ void editinput(void)
j = ((tilesizy[sprite[i].picnum]*sprite[i].yrepeat)<<1); j = ((tilesizy[sprite[i].picnum]*sprite[i].yrepeat)<<1);
if ((sprite[i].cstat&128) == 0) 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)), getceilzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)+(j<<1)),
getflorzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)); getflorzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y));
else 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), getceilzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)+j),
getflorzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)-j); getflorzofslope(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y)-j);

2
polymer/eduke32/build/src/engine.c
View file

@ -573,7 +573,7 @@ static char coldist[8] = {0,1,2,3,4,3,2,1};
static int32_t colscan[27]; static int32_t colscan[27];
static int16_t clipnum, hitwalls[4]; 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 #ifdef POLYMOST
int32_t hitallsprites = 0; int32_t hitallsprites = 0;
#endif #endif

2
polymer/eduke32/source/astub.c
View file

@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <shellapi.h> #include <shellapi.h>
#endif #endif
#define BUILDDATE " 20090117" #define BUILDDATE " 20090118"
#define VERSION " 1.2.0devel" #define VERSION " 1.2.0devel"
static int32_t floor_over_floor; static int32_t floor_over_floor;

10
polymer/eduke32/source/gameexec.c
View file

@ -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) if (s->statnum == 10 || s->statnum == 6 || s->statnum == 2 || s->statnum == 1 || s->statnum == 4)
{ {
int32_t hz,lz,zr = 127L; int32_t hz,lz,zr = 127L;
int32_t cstat = s->cstat;
s->cstat = 0;
if (s->statnum == 4) if (s->statnum == 4)
zr = 4L; 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); getzrange((vec3_t *)s,s->sectnum,&ActorExtra[iActor].ceilingz,&hz,&ActorExtra[iActor].floorz,&lz,zr,CLIPMASK0);
s->z += FOURSLEIGHT; s->z += FOURSLEIGHT;
s->cstat = cstat;
if ((lz&49152) == 49152 && (sprite[lz&(MAXSPRITES-1)].cstat&48) == 0) if ((lz&49152) == 49152 && (sprite[lz&(MAXSPRITES-1)].cstat&48) == 0)
{ {
lz &= (MAXSPRITES-1); 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)) if ((s->statnum == 1 || s->statnum == 10 || s->statnum == 2 || s->statnum == 6))
{ {
int32_t cstat = s->cstat;
s->cstat = 0;
s->z -= FOURSLEIGHT; s->z -= FOURSLEIGHT;
getzrange((vec3_t *)s,s->sectnum,&ActorExtra[iActor].ceilingz,&hz,&ActorExtra[iActor].floorz,&lz,127L,CLIPMASK0); getzrange((vec3_t *)s,s->sectnum,&ActorExtra[iActor].ceilingz,&hz,&ActorExtra[iActor].floorz,&lz,127L,CLIPMASK0);
s->z += FOURSLEIGHT; s->z += FOURSLEIGHT;
s->cstat = cstat;
} }
else else
{ {
@ -2968,8 +2976,10 @@ static int32_t X_DoExecute(void)
case CON_IFGAPZL: case CON_IFGAPZL:
insptr++; insptr++;
X_DoConditional(((ActorExtra[vm.g_i].floorz - ActorExtra[vm.g_i].ceilingz) >> 8) < *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) 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); OSD_Printf("%d %d\n",ActorExtra[vm.g_i].floorz,ActorExtra[vm.g_i].ceilingz);
*/
break; break;
case CON_IFHITSPACE: case CON_IFHITSPACE:

2
polymer/eduke32/source/global.c
View file

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include "duke3d.h" #include "duke3d.h"
const char *s_buildDate = "20090117"; const char *s_buildDate = "20090118";
char *MusicPtr = NULL; char *MusicPtr = NULL;
int32_t g_musicSize; int32_t g_musicSize;

6
polymer/eduke32/source/premap.c
View file

@ -520,8 +520,10 @@ void G_CacheMapData(void)
} }
if (totalclock - tc > TICRATE/4) if (totalclock - tc > TICRATE/4)
{ {
sprintf(tempbuf,"%d resources remaining\n",g_precacheCount-pc+1); /*Bsprintf(tempbuf,"%d resources remaining\n",g_precacheCount-pc+1);*/
G_DoLoadScreen(tempbuf, min(100,100*pc/g_precacheCount)); 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; tc = totalclock;
} }
} }