zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
terminx 2008-12-24 09:56:35 +00:00
parent a8451444ef
commit ab5db367f1
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
polymer/eduke32/build/src/build.c
View File

@ -1612,6 +1612,21 @@ void overheadeditor(void)
clear2dscreen(); clear2dscreen();
for (i=0;i<(MAXSECTORS>>3);i++)
show2dsector[i] = 255;
for (i=0;i<(MAXWALLS>>3);i++)
show2dwall[i] = 255;
for (i=0;i<(MAXSPRITES>>3);i++)
show2dsprite[i] = 255;
setview(0,0,xdim-1,ydim16-1);
i = yxaspect;
yxaspect = 65536;
j = ydim;
ydim = ydim16;
drawmapview(posx, posy, zoom, 1536);
yxaspect = i;
ydim = j;
draw2dgrid(posx,posy,ang,zoom,grid); draw2dgrid(posx,posy,ang,zoom,grid);
ExtPreCheckKeys(); ExtPreCheckKeys();

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

@ -4176,7 +4176,7 @@ static void fillpolygon(int npoints)
intptr_t p; intptr_t p;
#if defined POLYMOST && defined USE_OPENGL #if defined POLYMOST && defined USE_OPENGL
if (rendmode >= 3) { polymost_fillpolygon(npoints); return; } if (rendmode >= 3 && qsetmode == 200) { polymost_fillpolygon(npoints); return; }
#endif #endif
miny = 0x7fffffff; maxy = 0x80000000; miny = 0x7fffffff; maxy = 0x80000000;

4
polymer/eduke32/source/astub.c
View File

@ -8700,7 +8700,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
{ {
int i = 0; int i = 0;
int radius, xp1, yp1; int radius, xp1, yp1;
char col; int col;
if (qsetmode == 200) //In 3D mode if (qsetmode == 200) //In 3D mode
{ {
@ -8792,7 +8792,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
if (i+16384 == pointhighlight) if (i+16384 == pointhighlight)
if (totalclock & 32) col += (2<<2); if (totalclock & 32) col += (2<<2);
drawlinepat = 0xf0f0f0f0; drawlinepat = 0xf0f0f0f0;
drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, editorcolors[col]); drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, editorcolors[(int)col]);
drawlinepat = 0xffffffff; drawlinepat = 0xffffffff;
// radius = mulscale15(sprite[i].hitag,zoom); // radius = mulscale15(sprite[i].hitag,zoom);
// drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col); // drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col);

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

@ -337,10 +337,6 @@ void A_Fall(int iActor)
{ {
if (sector[s->sectnum].lotag == 2 && s->zvel > 3122) if (sector[s->sectnum].lotag == 2 && s->zvel > 3122)
s->zvel = 3144; s->zvel = 3144;
/* if (s->zvel < 6144)
s->zvel += c;
else s->zvel = 6144;
s->z += s->zvel; */
s->z += s->zvel = min(6144, s->zvel+c); s->z += s->zvel = min(6144, s->zvel+c);
} }
if (s->z >= ActorExtra[iActor].floorz-(FOURSLEIGHT)) if (s->z >= ActorExtra[iActor].floorz-(FOURSLEIGHT))
@ -1102,10 +1098,8 @@ static int X_DoExecute(void)
{ {
default: default:
// fix for flying/jumping monsters getting stuck in water // fix for flying/jumping monsters getting stuck in water
if (g_sp->statnum != MAXSTATUS && actorscrptr[g_sp->picnum] && if (g_sp->hitag & jumptoplayer || (actorscrptr[g_sp->picnum] &&
(g_sp->hitag & jumptoplayer || moveptr >= &script[0] && moveptr <= (&script[0]+g_scriptSize) && *(moveptr+1)))
(moveptr >= g_scriptPtr && moveptr <= (g_scriptPtr+g_scriptSize) && *(moveptr+1)))
)
{ {
// OSD_Printf("%d\n",*(moveptr+1)); // OSD_Printf("%d\n",*(moveptr+1));
break; break;