zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-12-23 23:27:53 +00:00
parent 663cbc37a5
commit a8451444ef
10 changed files with 304 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/include/build.h
View file

@ -269,6 +269,8 @@ EXTERN char gotpic[(MAXTILES+7)>>3];
EXTERN char gotsector[(MAXSECTORS+7)>>3];
EXTERN char captureformat;
EXTERN char editorcolors[256];
extern char vgapalette[5*256];
extern unsigned int drawlinepat;

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

@ -260,7 +260,7 @@ static int osdcmd_vidmode(const osdfuncparm_t *parm)
clearbuf((char *)frameplace, (ydim16*bytesperline) >> 2, 0L);
ydim16 = ydim;
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,1);
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,editorcolors[1]);
/* drawline16(0,ydim-1,xdim-1,ydim-1,1);
drawline16(0,ydim-STATUS2DSIZ,0,ydim-1,1);
drawline16(xdim-1,ydim-STATUS2DSIZ,xdim-1,ydim-1,1);
@ -1463,7 +1463,7 @@ void overheadeditor(void)
clearbuf((char *)frameplace, (ydim16*bytesperline) >> 2, 0L);
ydim16 = ydim;
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,1);
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,editorcolors[1]);
/* drawline16(0,ydim-1,xdim-1,ydim-1,1);
drawline16(0,ydim-STATUS2DSIZ,0,ydim-1,1);
drawline16(xdim-1,ydim-STATUS2DSIZ,xdim-1,ydim-1,1);
@ -1472,7 +1472,7 @@ void overheadeditor(void)
if (totalclock < 120*5)
{
printmessage16("Press F1 for help");
printext16(8L,ydim-STATUS2DSIZ+32L,9,-1,kensig,0);
printext16(8L,ydim-STATUS2DSIZ+32L,editorcolors[9],-1,kensig,0);
}
// printmessage16("Version: "VERSION);
@ -1624,9 +1624,9 @@ void overheadeditor(void)
x1 = mulscale11(sintable[(startang+2560)&2047],zoom) / 768;
y1 = mulscale11(sintable[(startang+2048)&2047],zoom) / 768;
begindrawing(); //{{{
drawline16((halfxdim16+x2)+x1,(midydim16+y2)+y1,(halfxdim16+x2)-x1,(midydim16+y2)-y1,2);
drawline16((halfxdim16+x2)+x1,(midydim16+y2)+y1,(halfxdim16+x2)+y1,(midydim16+y2)-x1,2);
drawline16((halfxdim16+x2)+x1,(midydim16+y2)+y1,(halfxdim16+x2)-y1,(midydim16+y2)+x1,2);
drawline16((halfxdim16+x2)+x1,(midydim16+y2)+y1,(halfxdim16+x2)-x1,(midydim16+y2)-y1,editorcolors[2]);
drawline16((halfxdim16+x2)+x1,(midydim16+y2)+y1,(halfxdim16+x2)+y1,(midydim16+y2)-x1,editorcolors[2]);
drawline16((halfxdim16+x2)+x1,(midydim16+y2)+y1,(halfxdim16+x2)-y1,(midydim16+y2)+x1,editorcolors[2]);
enddrawing(); //}}}
}
@ -1665,13 +1665,13 @@ void overheadeditor(void)
y2 = y1 + 7;
if ((x1 > 3) && (x2 < xdim) && (y1 > 1) && (y2 < ydim16))
{
printext16(x1,y1,0,7,dabuffer,1);
drawline16(x1-1,y1-1,x2-3,y1-1,7);
drawline16(x1-1,y2+1,x2-3,y2+1,7);
printext16(x1,y1,editorcolors[0],editorcolors[7],dabuffer,1);
drawline16(x1-1,y1-1,x2-3,y1-1,editorcolors[7]);
drawline16(x1-1,y2+1,x2-3,y2+1,editorcolors[7]);
drawline16(x1-2,y1,x1-2,y2,7);
drawline16(x2-2,y1,x2-2,y2,7);
drawline16(x2-3,y1,x2-3,y2,7);
drawline16(x1-2,y1,x1-2,y2,editorcolors[7]);
drawline16(x2-2,y1,x2-2,y2,editorcolors[7]);
drawline16(x2-3,y1,x2-3,y2,editorcolors[7]);
}
}
}
@ -1708,13 +1708,13 @@ void overheadeditor(void)
y2 = y1 + 7;
if ((x1 > 3) && (x2 < xdim) && (y1 > 1) && (y2 < ydim16))
{
printext16(x1,y1,0,31,dabuffer,1);
drawline16(x1-1,y1-1,x2-3,y1-1,31);
drawline16(x1-1,y2+1,x2-3,y2+1,31);
printext16(x1,y1,editorcolors[0],editorcolors[31],dabuffer,1);
drawline16(x1-1,y1-1,x2-3,y1-1,editorcolors[31]);
drawline16(x1-1,y2+1,x2-3,y2+1,editorcolors[31]);
drawline16(x1-2,y1,x1-2,y2,31);
drawline16(x2-2,y1,x2-2,y2,31);
drawline16(x2-3,y1,x2-3,y2,31);
drawline16(x1-2,y1,x1-2,y2,editorcolors[31]);
drawline16(x2-2,y1,x2-2,y2,editorcolors[31]);
drawline16(x2-3,y1,x2-3,y2,editorcolors[31]);
}
}
}
@ -1735,7 +1735,6 @@ void overheadeditor(void)
dax = mulscale14(dax-posx,zoom);
day = mulscale14(day-posy,zoom);
x1 = halfxdim16+dax-(Bstrlen(dabuffer)<<1);
y1 = midydim16+day-4;
x2 = x1 + (Bstrlen(dabuffer)<<2)+2;
@ -1754,14 +1753,14 @@ void overheadeditor(void)
if ((i == pointhighlight-16384) && (totalclock & 32)) col += (2<<2);
printext16(x1,y1,0,col,dabuffer,1);
printext16(x1,y1,editorcolors[0],editorcolors[col],dabuffer,1);
drawline16(x1-1,y1-1,x2-3,y1-1,col);
drawline16(x1-1,y2+1,x2-3,y2+1,col);
drawline16(x1-1,y1-1,x2-3,y1-1,editorcolors[col]);
drawline16(x1-1,y2+1,x2-3,y2+1,editorcolors[col]);
drawline16(x1-2,y1,x1-2,y2,col);
drawline16(x2-2,y1,x2-2,y2,col);
drawline16(x2-3,y1,x2-3,y2,col);
drawline16(x1-2,y1,x1-2,y2,editorcolors[col]);
drawline16(x2-2,y1,x2-2,y2,editorcolors[col]);
drawline16(x2-3,y1,x2-3,y2,editorcolors[col]);
}
}
j--;
@ -1781,8 +1780,8 @@ void overheadeditor(void)
if (keystatus[0x2a])
{
drawlinepat = 0x00ff00ff;
drawline16(searchx,0,searchx,ydim2d-1,15);
drawline16(0,searchy,xdim2d-1,searchy,15);
drawline16(searchx,0,searchx,ydim2d-1,editorcolors[15]);
drawline16(0,searchy,xdim2d-1,searchy,editorcolors[15]);
drawlinepat = 0xffffffff;
Bsprintf(tempbuf,"(%d,%d)",mousxplc,mousyplc);
@ -1793,21 +1792,21 @@ void overheadeditor(void)
if ((searchy+16) < (ydim2d-STATUS2DSIZ-1))
j = 0;
else j = (searchy+16)-(ydim2d-STATUS2DSIZ-1);
printext16(searchx+6-i,searchy+6-j,11,-1,tempbuf,0);
printext16(searchx+6-i,searchy+6-j,editorcolors[11],-1,tempbuf,0);
}
drawline16(searchx,0,searchx,8,15);
drawline16(0,searchy,8,searchy,15);
drawline16(searchx,0,searchx,8,editorcolors[15]);
drawline16(0,searchy,8,searchy,editorcolors[15]);
col = 15-((gridlock<<1)+gridlock);
if (joinsector[0] >= 0)col = 11;
drawline16(searchx,searchy-8,searchx,searchy-1,col);
drawline16(searchx+1,searchy-8,searchx+1,searchy-1,col);
drawline16(searchx,searchy+2,searchx,searchy+9,col);
drawline16(searchx+1,searchy+2,searchx+1,searchy+9,col);
drawline16(searchx-8,searchy,searchx-1,searchy,col);
drawline16(searchx-8,searchy+1,searchx-1,searchy+1,col);
drawline16(searchx+2,searchy,searchx+9,searchy,col);
drawline16(searchx+2,searchy+1,searchx+9,searchy+1,col);
drawline16(searchx,searchy-8,searchx,searchy-1,editorcolors[col]);
drawline16(searchx+1,searchy-8,searchx+1,searchy-1,editorcolors[col]);
drawline16(searchx,searchy+2,searchx,searchy+9,editorcolors[col]);
drawline16(searchx+1,searchy+2,searchx+1,searchy+9,editorcolors[col]);
drawline16(searchx-8,searchy,searchx-1,searchy,editorcolors[col]);
drawline16(searchx-8,searchy+1,searchx-1,searchy+1,editorcolors[col]);
drawline16(searchx+2,searchy,searchx+9,searchy,editorcolors[col]);
drawline16(searchx+2,searchy+1,searchx+9,searchy+1,editorcolors[col]);
//Draw the white pixel closest to mouse cursor on linehighlight
if (linehighlight>=0)
@ -1816,9 +1815,9 @@ void overheadeditor(void)
x2 = mulscale14(dax-posx,zoom);
y2 = mulscale14(day-posy,zoom);
if (wall[linehighlight].nextsector >= 0)
drawline16(halfxdim16+x2,midydim16+y2,halfxdim16+x2,midydim16+y2,15);
drawline16(halfxdim16+x2,midydim16+y2,halfxdim16+x2,midydim16+y2,editorcolors[15]);
else
drawline16(halfxdim16+x2,midydim16+y2,halfxdim16+x2,midydim16+y2,5);
drawline16(halfxdim16+x2,midydim16+y2,halfxdim16+x2,midydim16+y2,editorcolors[5]);
}
enddrawing(); //}}}
@ -2565,10 +2564,10 @@ void overheadeditor(void)
{
highlightx2 = searchx, highlighty2 = searchy;
ydim16 = ydim-STATUS2DSIZ;
drawline16(highlightx2,highlighty1,highlightx1,highlighty1,5);
drawline16(highlightx2,highlighty2,highlightx1,highlighty2,5);
drawline16(highlightx1,highlighty2,highlightx1,highlighty1,5);
drawline16(highlightx2,highlighty2,highlightx2,highlighty1,5);
drawline16(highlightx2,highlighty1,highlightx1,highlighty1,editorcolors[5]);
drawline16(highlightx2,highlighty2,highlightx1,highlighty2,editorcolors[5]);
drawline16(highlightx1,highlighty2,highlightx1,highlighty1,editorcolors[5]);
drawline16(highlightx2,highlighty2,highlightx2,highlighty1,editorcolors[5]);
}
if (highlightcnt != 0)
{
@ -2656,10 +2655,10 @@ void overheadeditor(void)
highlightx2 = searchx, highlighty2 = searchy;
ydim16 = ydim-STATUS2DSIZ;
begindrawing(); //{{{
drawline16(highlightx2,highlighty1,highlightx1,highlighty1,10);
drawline16(highlightx2,highlighty2,highlightx1,highlighty2,10);
drawline16(highlightx1,highlighty2,highlightx1,highlighty1,10);
drawline16(highlightx2,highlighty2,highlightx2,highlighty1,10);
drawline16(highlightx2,highlighty1,highlightx1,highlighty1,editorcolors[10]);
drawline16(highlightx2,highlighty2,highlightx1,highlighty2,editorcolors[10]);
drawline16(highlightx1,highlighty2,highlightx1,highlighty1,editorcolors[10]);
drawline16(highlightx2,highlighty2,highlightx2,highlighty1,editorcolors[10]);
enddrawing(); //}}}
}
if (highlightsectorcnt != 0)
@ -3454,8 +3453,8 @@ SKIP:
dax = mulscale14(centerx-posx,zoom);
day = mulscale14(centery-posy,zoom);
drawline16(halfxdim16+dax-2,midydim16+day-2,halfxdim16+dax+2,midydim16+day+2,14);
drawline16(halfxdim16+dax-2,midydim16+day+2,halfxdim16+dax+2,midydim16+day-2,14);
drawline16(halfxdim16+dax-2,midydim16+day-2,halfxdim16+dax+2,midydim16+day+2,editorcolors[14]);
drawline16(halfxdim16+dax-2,midydim16+day+2,halfxdim16+dax+2,midydim16+day-2,editorcolors[14]);
circleang1 = getangle(x1-centerx,y1-centery);
circleang2 = getangle(x2-centerx,y2-centery);
@ -3491,10 +3490,10 @@ SKIP:
}
dax = mulscale14(dax-posx,zoom);
day = mulscale14(day-posy,zoom);
drawline16(halfxdim16+dax-pointsize,midydim16+day-pointsize,halfxdim16+dax+pointsize,midydim16+day-pointsize,14);
drawline16(halfxdim16+dax+pointsize,midydim16+day-pointsize,halfxdim16+dax+pointsize,midydim16+day+pointsize,14);
drawline16(halfxdim16+dax+pointsize,midydim16+day+pointsize,halfxdim16+dax-pointsize,midydim16+day+pointsize,14);
drawline16(halfxdim16+dax-pointsize,midydim16+day+pointsize,halfxdim16+dax-pointsize,midydim16+day-pointsize,14);
drawline16(halfxdim16+dax-pointsize,midydim16+day-pointsize,halfxdim16+dax+pointsize,midydim16+day-pointsize,editorcolors[14]);
drawline16(halfxdim16+dax+pointsize,midydim16+day-pointsize,halfxdim16+dax+pointsize,midydim16+day+pointsize,editorcolors[14]);
drawline16(halfxdim16+dax+pointsize,midydim16+day+pointsize,halfxdim16+dax-pointsize,midydim16+day+pointsize,editorcolors[14]);
drawline16(halfxdim16+dax-pointsize,midydim16+day+pointsize,halfxdim16+dax-pointsize,midydim16+day-pointsize,editorcolors[14]);
// drawcircle16(halfxdim16+dax, midydim16+day, 3, 14);
}
if (bad > 0)
@ -5292,8 +5291,8 @@ void clearmidstatbar16(void)
clearbuf((char *)(frameplace + (bytesperline*(ydim-STATUS2DSIZ+25L))),(bytesperline*(STATUS2DSIZ+2-(25<<1))) >> 2, 0x00000000l);
else
clearbuf((char *)(frameplace + (bytesperline*(ydim-overridepm16y+25L))),(bytesperline*(overridepm16y+2-(25<<1))) >> 2, 0x00000000l);
drawline16(0,ydim-STATUS2DSIZ,0,ydim-1,7);
drawline16(xdim-1,ydim-STATUS2DSIZ,xdim-1,ydim-1,7);
drawline16(0,ydim-STATUS2DSIZ,0,ydim-1,editorcolors[7]);
drawline16(xdim-1,ydim-STATUS2DSIZ,xdim-1,ydim-1,editorcolors[7]);
ydim16 = ydim-STATUS2DSIZ;
enddrawing();
}
@ -5362,7 +5361,7 @@ int _getnumber16(char *namestart, int num, int maxnumber, char sign, void *(func
if (func != NULL)
{
Bsprintf(buffer,"^011%s",(char *)func((int)danum));
printext16(200L-24, ydim-STATUS2DSIZ+20L, 9, 0, buffer, 0);
printext16(200L-24, ydim-STATUS2DSIZ+20L, editorcolors[9], editorcolors[0], buffer, 0);
}
showframe(1);
@ -5592,11 +5591,11 @@ int menuselect(void)
sprintf(buffer,"Game filesystem %smode; press F for local filesystem or G for %s.",
grponlymode?"GRP-only ":"", grponlymode?"all files":"GRP contents only");
}
printext16(halfxdim16-(8*strlen(buffer)/2), 4, 12,0,buffer,0);
printext16(halfxdim16-(8*strlen(buffer)/2), 4, editorcolors[12],editorcolors[0],buffer,0);
Bsnprintf(buffer,sizeof(buffer)-1,"(%d dirs, %d files) %s",numdirs,numfiles,selectedboardfilename);
buffer[sizeof(buffer)-1] = 0;
printext16(1,ydim16-8-1,8,0,buffer,0);
printext16(1,ydim16-8-1,editorcolors[8],editorcolors[0],buffer,0);
if (finddirshigh)
{
@ -5615,12 +5614,12 @@ int menuselect(void)
buffer[21] = buffer[22] = buffer[23] = '.', buffer[24] = 0;
if (dir == finddirshigh)
{
if (currentlist == 0) printext16(8,16+8*i,c|8,0,"->",0);
printext16(32,16+8*i,c|8,0,buffer,0);
if (currentlist == 0) printext16(8,16+8*i,editorcolors[c|8],editorcolors[0],"->",0);
printext16(32,16+8*i,editorcolors[c|8],editorcolors[0],buffer,0);
}
else
{
printext16(32,16+8*i,c,0,buffer,0);
printext16(32,16+8*i,editorcolors[c],editorcolors[0],buffer,0);
}
}
}
@ -5637,12 +5636,12 @@ int menuselect(void)
{
if (dir == findfileshigh)
{
if (currentlist == 1) printext16(240,16+8*i,7|8,0,"->",0);
printext16(240+24,16+8*i,7|8,0,dir->name,0);
if (currentlist == 1) printext16(240,16+8*i,editorcolors[7|8],editorcolors[0],"->",0);
printext16(240+24,16+8*i,editorcolors[7|8],editorcolors[0],dir->name,0);
}
else
{
printext16(240+24,16+8*i,7,0,dir->name,0);
printext16(240+24,16+8*i,editorcolors[7],editorcolors[0],dir->name,0);
}
}
}
@ -5884,7 +5883,7 @@ int fillsector(short sectnum, char fillcolor)
if (fillist[z] > rborder) break;
if (fillist[z+1] > rborder)
fillist[z+1] = rborder;
drawline16(fillist[z],sy,fillist[z+1],sy,fillcolor);
drawline16(fillist[z],sy,fillist[z+1],sy,editorcolors[fillcolor]);
}
}
}
@ -6132,7 +6131,7 @@ void printcoords16(int posxe, int posye, short ange)
}
snotbuf[30] = 0;
printext16(8, ydim-STATUS2DSIZ+128, 9, 0, snotbuf,0);
printext16(8, ydim-STATUS2DSIZ+128, editorcolors[9], editorcolors[0], snotbuf,0);
m = (numsectors > MAXSECTORSV7 || numwalls > MAXWALLSV7 || numsprites > MAXSPRITESV7);
@ -6151,7 +6150,7 @@ void printcoords16(int posxe, int posye, short ange)
}
snotbuf[46] = 0;
printext16(264, ydim-STATUS2DSIZ+128, 9+m, 0, snotbuf,0);
printext16(264, ydim-STATUS2DSIZ+128, editorcolors[9+m], editorcolors[0], snotbuf,0);
}
void updatenumsprites(void)
@ -6223,55 +6222,55 @@ void showsectordata(short sectnum)
char snotbuf[80];
Bsprintf(snotbuf,"^10Sector %d ^O(F7 to edit)",sectnum);
printext16(8,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+32,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Firstwall: %d",sector[sectnum].wallptr);
printext16(8,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Numberofwalls: %d",sector[sectnum].wallnum);
printext16(8,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Firstsprite: %d",headspritesect[sectnum]);
printext16(8,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tags: %d, %d",sector[sectnum].hitag,sector[sectnum].lotag);
printext16(8,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf," (0x%x), (0x%x)",sector[sectnum].hitag,sector[sectnum].lotag);
printext16(8,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Extra: %d",sector[sectnum].extra);
printext16(8,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Visibility: %d",sector[sectnum].visibility);
printext16(8,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Pixel height: %d",(sector[sectnum].floorz-sector[sectnum].ceilingz)>>8);
printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+104,editorcolors[11],-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+32,11,-1,"^10CEILINGS:^O",0);
printext16(200,ydim-STATUS2DSIZ+32,editorcolors[11],-1,"^10CEILINGS:^O",0);
Bsprintf(snotbuf,"Flags (hex): %x",sector[sectnum].ceilingstat);
printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)pan: %d, %d",sector[sectnum].ceilingxpanning,sector[sectnum].ceilingypanning);
printext16(200,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Shade byte: %d",sector[sectnum].ceilingshade);
printext16(200,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Z-coordinate: %d",sector[sectnum].ceilingz);
printext16(200,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tile number: %d",sector[sectnum].ceilingpicnum);
printext16(200,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Ceiling heinum: %d",sector[sectnum].ceilingheinum);
printext16(200,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Palookup number: %d",sector[sectnum].ceilingpal);
printext16(200,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+32,11,-1,"^10FLOORS:^O",0);
printext16(400,ydim-STATUS2DSIZ+32,editorcolors[11],-1,"^10FLOORS:^O",0);
Bsprintf(snotbuf,"Flags (hex): %x",sector[sectnum].floorstat);
printext16(400,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)pan: %d, %d",sector[sectnum].floorxpanning,sector[sectnum].floorypanning);
printext16(400,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Shade byte: %d",sector[sectnum].floorshade);
printext16(400,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Z-coordinate: %d",sector[sectnum].floorz);
printext16(400,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tile number: %d",sector[sectnum].floorpicnum);
printext16(400,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Floor heinum: %d",sector[sectnum].floorheinum);
printext16(400,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Palookup number: %d",sector[sectnum].floorpal);
printext16(400,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
}
void showwalldata(short wallnum)
@ -6280,44 +6279,44 @@ void showwalldata(short wallnum)
char snotbuf[80];
Bsprintf(snotbuf,"^10Wall %d ^O(F8 to edit)",wallnum);
printext16(8,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+32,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"X-coordinate: %d",wall[wallnum].x);
printext16(8,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Y-coordinate: %d",wall[wallnum].y);
printext16(8,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Point2: %d",wall[wallnum].point2);
printext16(8,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Sector: %d",sectorofwall(wallnum));
printext16(8,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tags: %d, %d",wall[wallnum].hitag,wall[wallnum].lotag);
printext16(8,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf," (0x%x), (0x%x)",wall[wallnum].hitag,wall[wallnum].lotag);
printext16(8,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+32,11,-1,names[wall[wallnum].picnum],0);
printext16(200,ydim-STATUS2DSIZ+32,editorcolors[11],-1,names[wall[wallnum].picnum],0);
Bsprintf(snotbuf,"Flags (hex): %x",wall[wallnum].cstat);
printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Shade: %d",wall[wallnum].shade);
printext16(200,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Pal: %d",wall[wallnum].pal);
printext16(200,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)repeat: %d, %d",wall[wallnum].xrepeat,wall[wallnum].yrepeat);
printext16(200,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)pan: %d, %d",wall[wallnum].xpanning,wall[wallnum].ypanning);
printext16(200,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tile number: %d",wall[wallnum].picnum);
printext16(200,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"OverTile number: %d",wall[wallnum].overpicnum);
printext16(200,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"nextsector: %d",wall[wallnum].nextsector);
printext16(400,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"nextwall: %d",wall[wallnum].nextwall);
printext16(400,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Extra: %d",wall[wallnum].extra);
printext16(400,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
dax = wall[wallnum].x-wall[wall[wallnum].point2].x;
day = wall[wallnum].y-wall[wall[wallnum].point2].y;
@ -6326,11 +6325,11 @@ void showwalldata(short wallnum)
// TX 20050102 I'm not sure what unit dist<<4 is supposed to be, but dist itself is correct in terms of game coordinates as one would expect
Bsprintf(snotbuf,"Wall length: %d",dist);
printext16(400,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
dax = (int)sectorofwall(wallnum);
Bsprintf(snotbuf,"Pixel height: %d",(sector[dax].floorz-sector[dax].ceilingz)>>8);
printext16(400,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+104,editorcolors[11],-1,snotbuf,0);
}
void showspritedata(short spritenum)
@ -6338,53 +6337,53 @@ void showspritedata(short spritenum)
char snotbuf[80];
Bsprintf(snotbuf,"^10Sprite %d ^O(F8 to edit)",spritenum);
printext16(8,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+32,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"X-coordinate: %d",sprite[spritenum].x);
printext16(8,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Y-coordinate: %d",sprite[spritenum].y);
printext16(8,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Z-coordinate: %d",sprite[spritenum].z);
printext16(8,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Sectnum: %d",sprite[spritenum].sectnum);
printext16(8,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Statnum: %d",sprite[spritenum].statnum);
printext16(8,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tags: %d, %d",sprite[spritenum].hitag,sprite[spritenum].lotag);
printext16(8,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf," (0x%x), (0x%x)",sprite[spritenum].hitag,sprite[spritenum].lotag);
printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0);
printext16(8,ydim-STATUS2DSIZ+104,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"^10%s^O",names[sprite[spritenum].picnum]);
printext16(200,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+32,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Flags (hex): %x",sprite[spritenum].cstat);
printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Shade: %d",sprite[spritenum].shade);
printext16(200,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Pal: %d",sprite[spritenum].pal);
printext16(200,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)repeat: %d, %d",sprite[spritenum].xrepeat,sprite[spritenum].yrepeat);
printext16(200,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"(X,Y)offset: %d, %d",sprite[spritenum].xoffset,sprite[spritenum].yoffset);
printext16(200,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Tile number: %d",sprite[spritenum].picnum);
printext16(200,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(200,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Angle (2048 degrees): %d",sprite[spritenum].ang);
printext16(400,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+48,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"X-Velocity: %d",sprite[spritenum].xvel);
printext16(400,ydim-STATUS2DSIZ+56,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+56,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Y-Velocity: %d",sprite[spritenum].yvel);
printext16(400,ydim-STATUS2DSIZ+64,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+64,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Z-Velocity: %d",sprite[spritenum].zvel);
printext16(400,ydim-STATUS2DSIZ+72,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+72,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Owner: %d",sprite[spritenum].owner);
printext16(400,ydim-STATUS2DSIZ+80,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+80,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Clipdist: %d",sprite[spritenum].clipdist);
printext16(400,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+88,editorcolors[11],-1,snotbuf,0);
Bsprintf(snotbuf,"Extra: %d",sprite[spritenum].extra);
printext16(400,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
printext16(400,ydim-STATUS2DSIZ+96,editorcolors[11],-1,snotbuf,0);
}
void keytimerstuff(void)
@ -6444,7 +6443,7 @@ void _printmessage16(const char *fmt, ...)
snotbuf[54] = 0;
begindrawing();
ybase = (overridepm16y >= 0) ? ydim-overridepm16y : ydim-STATUS2DSIZ;
printext16(200L-24, ybase+8L, 9, 0, snotbuf, 0);
printext16(200L-24, ybase+8L, editorcolors[9], editorcolors[0], snotbuf, 0);
i = 0;
while (i < 54)
{
@ -6452,7 +6451,7 @@ void _printmessage16(const char *fmt, ...)
i++;
}
snotbuf[54] = 0;
printext16(200L-24, ybase+20L, 9, 0, snotbuf, 0);
printext16(200L-24, ybase+20L, editorcolors[9], editorcolors[0], snotbuf, 0);
enddrawing();
}

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

@ -4568,9 +4568,9 @@ static void dorotatesprite(int sx, int sy, int z, short a, short picnum, signed
UNREFERENCED_PARAMETER(uniqid);
//============================================================================= //POLYMOST BEGINS
#ifdef POLYMOST
if (rendmode >= 3) { polymost_dorotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,cx1,cy1,cx2,cy2,uniqid); return; }
if (rendmode >= 3 && qsetmode == 200) { polymost_dorotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,cx1,cy1,cx2,cy2,uniqid); return; }
# ifdef POLYMER
if (rendmode == 4) { polymer_rotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,cx1,cy1,cx2,cy2); return; }
if (rendmode == 4 && qsetmode == 200) { polymer_rotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,cx1,cy1,cx2,cy2); return; }
#endif
#endif
//============================================================================= //POLYMOST ENDS
@ -10861,7 +10861,7 @@ void qsetmode640350(void)
xdim = xres;
ydim = yres;
setvgapalette();
// setvgapalette();
ydim16 = 350;
halfxdim16 = 320;
@ -10892,7 +10892,7 @@ void qsetmode640480(void)
xdim = xres;
ydim = yres;
setvgapalette();
// setvgapalette();
ydim16 = 336;
halfxdim16 = 320;
@ -10924,7 +10924,7 @@ void qsetmodeany(int daxdim, int daydim)
xdim = xres;
ydim = yres;
setvgapalette();
// setvgapalette();
ydim16 = yres - STATUS2DSIZ;
halfxdim16 = xres >> 1;
@ -10958,7 +10958,6 @@ void clear2dscreen(void)
enddrawing(); //}}}
}
//
// draw2dgrid
//
@ -10989,7 +10988,7 @@ void draw2dgrid(int posxe, int posye, short ange, int zoome, short gride)
{
if (xp1 != xp2)
{
drawline16(xp1,yp1,xp1,yp2,8);
drawline16(xp1,yp1,xp1,yp2,editorcolors[8]);
}
}
}
@ -10997,7 +10996,7 @@ void draw2dgrid(int posxe, int posye, short ange, int zoome, short gride)
xp2 = xp1;
if ((xp2 >= 0) && (xp2 < xdim))
{
drawline16(xp2,yp1,xp2,yp2,8);
drawline16(xp2,yp1,xp2,yp2,editorcolors[8]);
}
}
xp1 = mulscale14(posxe+editorgridextent,zoome);
@ -11010,7 +11009,7 @@ void draw2dgrid(int posxe, int posye, short ange, int zoome, short gride)
{
if ((yp1 > midydim16-ydim16) && (yp1 <= midydim16))
{
drawline16(halfxdim16-xp1,midydim16-yp1,halfxdim16-xp2,midydim16-yp1,8);
drawline16(halfxdim16-xp1,midydim16-yp1,halfxdim16-xp2,midydim16-yp1,editorcolors[8]);
tempy = yp1;
}
}
@ -11107,18 +11106,18 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
{
if (klabs(xp2-xp1) >= klabs(yp2-yp1))
{
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp2,midydim16+yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp2,midydim16+yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp2,midydim16+yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp2,midydim16+yp2-1,editorcolors[col]);
}
else
{
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp2+1,midydim16+yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp2-1,midydim16+yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp2+1,midydim16+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp2-1,midydim16+yp2,editorcolors[col]);
}
col += 8;
}
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp2,midydim16+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp2,midydim16+yp2,editorcolors[col]);
{
int k = getangle(xp1-xp2, yp1-yp2);
int dax = mulscale14(((wal->x+wall[wal->point2].x)>>1)-posxe,zoome);
@ -11135,26 +11134,26 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
int day3 = mulscale11(sintable[(k+512)&2047],zoome) / 2560;
int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 2560;
int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 2560;
drawline16(halfxdim16+dax+dax3,midydim16+day+day3,halfxdim16+dax+dax2,midydim16+day+day2,col);
drawline16(halfxdim16+dax+dax3,midydim16+day+day3,halfxdim16+dax+dax2,midydim16+day+day2,editorcolors[col]);
}
else if (jj > ii)
{
int dax2 = mulscale11(sintable[(k+1024)&2047],zoome) / 2560;
int day2 = mulscale11(sintable[(k+512)&2047],zoome) / 2560;
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col);
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,editorcolors[col]);
}
else if (jj < ii)
{
int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 2560;
int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 2560;
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col);
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,editorcolors[col]);
}
}
else if (showheightindicators > 1)
{
int dax2 = mulscale11(sintable[(k+2048)&2047],zoome) / 2560;
int day2 = mulscale11(sintable[(k+1536)&2047],zoome) / 2560;
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,col);
drawline16(halfxdim16+dax,midydim16+day,halfxdim16+dax+dax2,midydim16+day+day2,editorcolors[col]);
}
}
if ((zoome >= 256) && (editstatus == 1))
@ -11189,7 +11188,7 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
drawline16(halfxdim16+xp1+pointsize,midydim16+yp1+pointsize,halfxdim16+xp1+pointsize,midydim16+yp1-pointsize,col);
drawline16(halfxdim16+xp1+pointsize,midydim16+yp1-pointsize,halfxdim16+xp1-pointsize,midydim16+yp1-pointsize,col);
drawline16(halfxdim16+xp1-pointsize,midydim16+yp1-pointsize,halfxdim16+xp1-pointsize,midydim16+yp1+pointsize,col); */
drawcircle16(halfxdim16+xp1, midydim16+yp1, pointsize, col);
drawcircle16(halfxdim16+xp1, midydim16+yp1, pointsize, editorcolors[col]);
}
while (pointsize--);
#else
@ -11233,29 +11232,29 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
{
tempint = ((midydim16+yp1)*bytesperline)+(halfxdim16+xp1)+frameplace;
drawcircle16(halfxdim16+xp1, midydim16+yp1, 4, col);
drawcircle16(halfxdim16+xp1, midydim16+yp1, 4, editorcolors[col]);
xp2 = mulscale11(sintable[(sprite[j].ang+2560)&2047],zoome) / 768;
yp2 = mulscale11(sintable[(sprite[j].ang+2048)&2047],zoome) / 768;
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
if ((sprite[j].cstat&256) > 0)
{
if (((sprite[j].ang+256)&512) == 0)
{
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,editorcolors[col]);
}
else
{
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,editorcolors[col]);
}
@ -11286,22 +11285,22 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
{
drawline16(halfxdim16 + xp1 + co[ii][0], midydim16 + yp1 - co[ii][1],
halfxdim16 + xp1 + co[(ii+1)&3][0], midydim16 + yp1 - co[(ii+1)&3][1],
col);
editorcolors[col]);
drawline16(halfxdim16 + xp1 + co[ii][0], midydim16 + yp1 - co[ii][1] + 1,
halfxdim16 + xp1 + co[(ii+1)&3][0], midydim16 + yp1 - co[(ii+1)&3][1] + 1,
col);
editorcolors[col]);
drawline16(halfxdim16 + xp1 + co[ii][0], midydim16 + yp1 - co[ii][1] - 1,
halfxdim16 + xp1 + co[(ii+1)&3][0], midydim16 + yp1 - co[(ii+1)&3][1] - 1,
col);
editorcolors[col]);
drawline16(halfxdim16 + xp1 + co[ii][0] + 1, midydim16 + yp1 - co[ii][1],
halfxdim16 + xp1 + co[(ii+1)&3][0] + 1, midydim16 + yp1 - co[(ii+1)&3][1],
col);
editorcolors[col]);
drawline16(halfxdim16 + xp1 + co[ii][0] - 1, midydim16 + yp1 - co[ii][1],
halfxdim16 + xp1 + co[(ii+1)&3][0] - 1, midydim16 + yp1 - co[(ii+1)&3][1],
col);
editorcolors[col]);
drawline16(halfxdim16 + xp1, midydim16 + yp1,
halfxdim16 + xp1 + co[(ii+1)&3][0], midydim16 + yp1 - co[(ii+1)&3][1],
col);
editorcolors[col]);
}
drawlinepat = 0xffffffff;
}
@ -11317,53 +11316,53 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
{
if (!(sprite[j].cstat&64))
{
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1-xp2,midydim16+yp1-yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1-xp2,midydim16+yp1-yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1-xp2,midydim16+yp1-yp2-1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1-xp2,midydim16+yp1-yp2+1,editorcolors[col]);
}
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,editorcolors[col]);
xp2 = mulscale13(sintable[(sprite[j].ang+1024)&2047],zoome) * fx / 4096;
yp2 = mulscale13(sintable[(sprite[j].ang+512)&2047],zoome) * fx / 4096;
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1-xp2-1,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1-xp2+1,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1-xp2-1,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1-xp2+1,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1-xp2,midydim16+yp1-yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1-xp2,midydim16+yp1-yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1-xp2,midydim16+yp1-yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1-xp2,midydim16+yp1-yp2-1,editorcolors[col]);
}
else
{
if (!(sprite[j].cstat&64))
{
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1-xp2-1,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1-xp2+1,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1-xp2-1,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1-xp2+1,midydim16+yp1-yp2,editorcolors[col]);
}
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,editorcolors[col]);
xp2 = mulscale13(sintable[(sprite[j].ang+1024)&2047],zoome) * fx / 4096;
yp2 = mulscale13(sintable[(sprite[j].ang+512)&2047],zoome) * fx / 4096;
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1-xp2-1,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1-xp2+1,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1+xp2+1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1-xp2-1,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1-1,midydim16+yp1,halfxdim16+xp1+xp2-1,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1+1,midydim16+yp1,halfxdim16+xp1-xp2+1,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1-xp2,midydim16+yp1-yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1-xp2,midydim16+yp1-yp2-1,col);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1+xp2,midydim16+yp1+yp2-1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1-xp2,midydim16+yp1-yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1+1,halfxdim16+xp1+xp2,midydim16+yp1+yp2+1,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1-1,halfxdim16+xp1-xp2,midydim16+yp1-yp2-1,editorcolors[col]);
}
}
@ -11378,13 +11377,13 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
xp2 = mulscale11(sintable[(sprite[j].ang+2560)&2047],zoome) / 6144;
yp2 = mulscale11(sintable[(sprite[j].ang+2048)&2047],zoome) / 6144;
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
if (!(sprite[j].cstat&64)) drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
if (!(sprite[j].cstat&64)) drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,editorcolors[col]);
xp2 = mulscale13(sintable[(sprite[j].ang+1024)&2047],zoome) * fx / 4096;
yp2 = mulscale13(sintable[(sprite[j].ang+512)&2047],zoome) * fx / 4096;
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,col);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1+xp2,midydim16+yp1+yp2,editorcolors[col]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+xp1-xp2,midydim16+yp1-yp2,editorcolors[col]);
col += 8;
@ -11417,10 +11416,10 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
{
drawline16(halfxdim16 + xp1 + co[ii][0], midydim16 + yp1 - co[ii][1],
halfxdim16 + xp1 + co[(ii+1)&3][0], midydim16 + yp1 - co[(ii+1)&3][1],
col);
editorcolors[col]);
drawline16(halfxdim16 + xp1, midydim16 + yp1,
halfxdim16 + xp1 + co[(ii+1)&3][0], midydim16 + yp1 - co[(ii+1)&3][1],
col);
editorcolors[col]);
}
drawlinepat = 0xffffffff;
}
@ -11430,9 +11429,9 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
faketimerhandler();
xp1 = mulscale11(sintable[(ange+2560)&2047],zoome) / 768; //Draw white arrow
yp1 = mulscale11(sintable[(ange+2048)&2047],zoome) / 768;
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16-xp1,midydim16-yp1,15);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+yp1,midydim16-xp1,15);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16-yp1,midydim16+xp1,15);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16-xp1,midydim16-yp1,editorcolors[15]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16+yp1,midydim16-xp1,editorcolors[15]);
drawline16(halfxdim16+xp1,midydim16+yp1,halfxdim16-yp1,midydim16+xp1,editorcolors[15]);
enddrawing(); //}}}
@ -11486,7 +11485,7 @@ int printext16(int xpos, int ypos, short col, short backcol, char *name, char fo
smallbuf[0] = name[i];
smallbuf[1] = '\0';
}
col = atol(smallbuf);
col = editorcolors[atol(smallbuf)];
if (name[i+1] == ',' && isdigit(name[i+2]))
{
@ -11511,7 +11510,7 @@ int printext16(int xpos, int ypos, short col, short backcol, char *name, char fo
smallbuf[0] = name[i];
smallbuf[1] = '\0';
}
backcol = atol(smallbuf);
backcol = editorcolors[atol(smallbuf)];
}
continue;
}

5
polymer/eduke32/build/src/polymost.c
View file

@ -941,6 +941,7 @@ void polymost_glinit()
void invalidatecache(void)
{
polymost_glreset();
if (cachefilehandle != -1)
{
Bclose(cachefilehandle);
@ -972,7 +973,9 @@ void invalidatecache(void)
// LoadCacheOffsets();
Bstrcpy(tempbuf,TEXCACHEFILE);
unlink(tempbuf);
Bstrcat(tempbuf,".cache");
unlink(tempbuf);
cacheindexptr = Bfopen(tempbuf, "wt");
if (!cacheindexptr)
{
@ -983,7 +986,7 @@ void invalidatecache(void)
Bfprintf(cacheindexptr,"// automatically generated by EDuke32, DO NOT MODIFY!\n");
cachefilehandle = Bopen(TEXCACHEFILE,BO_BINARY|BO_TRUNC|BO_APPEND|BO_RDWR,BS_IREAD|BS_IWRITE);
cachefilehandle = Bopen(TEXCACHEFILE,BO_BINARY|BO_CREAT|BO_TRUNC|BO_APPEND|BO_RDWR,BS_IREAD|BS_IWRITE);
if (cachefilehandle < 0)
{

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

@ -753,7 +753,7 @@ void ExtShowSectorData(short sectnum) //F5
x2=14;
y=4;
begindrawing();
printext16(x*8,ydim16+y*8,11,-1,"Item Count",0);
printext16(x*8,ydim16+y*8,editorcolors[11],-1,"Item Count",0);
enddrawing();
PrintStatus("10%health=",numsprite[COLA],x,y+2,11);
PrintStatus("",multisprite[COLA],x2,y+2,9);
@ -770,7 +770,7 @@ void ExtShowSectorData(short sectnum) //F5
x2=30;
y=4;
begindrawing();
printext16(x*8,ydim16+y*8,11,-1,"Inventory",0);
printext16(x*8,ydim16+y*8,editorcolors[11],-1,"Inventory",0);
enddrawing();
PrintStatus("Steroids =",numsprite[STEROIDS],x,y+2,11);
PrintStatus("",multisprite[STEROIDS],x2,y+2,9);
@ -790,7 +790,7 @@ void ExtShowSectorData(short sectnum) //F5
x2=46;
y=4;
begindrawing();
printext16(x*8,ydim16+y*8,11,-1,"Weapon Count",0);
printext16(x*8,ydim16+y*8,editorcolors[11],-1,"Weapon Count",0);
enddrawing();
PrintStatus("Pistol =",numsprite[FIRSTGUNSPRITE],x,y+2,11);
PrintStatus("",multisprite[FIRSTGUNSPRITE],x2,y+2,9);
@ -815,7 +815,7 @@ void ExtShowSectorData(short sectnum) //F5
x2=62;
y=4;
begindrawing();
printext16(x*8,ydim16+y*8,11,-1,"Ammo Count",0);
printext16(x*8,ydim16+y*8,editorcolors[11],-1,"Ammo Count",0);
enddrawing();
PrintStatus("Pistol =",numsprite[AMMO],x,y+2,11);
PrintStatus("",multisprite[AMMO],x2,y+2,9);
@ -837,11 +837,11 @@ void ExtShowSectorData(short sectnum) //F5
PrintStatus("",multisprite[FREEZEAMMO],x2,y+10,9);
begindrawing();
printext16(65*8,ydim16+4*8,11,-1,"MISC",0);
printext16(65*8,ydim16+4*8,editorcolors[11],-1,"MISC",0);
enddrawing();
PrintStatus("Secrets =",secrets,65,6,11);
begindrawing();
printext16(65*8,ydim16+8*8,11,-1,"ACTORS",0);
printext16(65*8,ydim16+8*8,editorcolors[11],-1,"ACTORS",0);
enddrawing();
PrintStatus("Skill 1 =",totalactors1,65,10,11);
PrintStatus("Skill 2 =",totalactors2,65,11,11);
@ -1134,7 +1134,7 @@ static void Show2dText(char *name)
if ((fp=kopen4load(name,0)) == -1)
{
begindrawing();
printext16(1*4,ydim16+4*8,11,-1,"ERROR: file not found.",0);
printext16(1*4,ydim16+4*8,editorcolors[11],-1,"ERROR: file not found.",0);
enddrawing();
return;
}
@ -1155,7 +1155,7 @@ static void Show2dText(char *name)
if (x>xmax) xmax=x;
}
tempbuf[x]=0;
printext16(xx*4,ydim16+(y*6)+2,11,-1,tempbuf,1);
printext16(xx*4,ydim16+(y*6)+2,editorcolors[11],-1,tempbuf,1);
x=0;
y++;
if (y>18)
@ -1336,10 +1336,10 @@ static void IntegratedHelp()
begindrawing();
clearbuf((char *)(frameplace + (ydim-overridepm16y)*bytesperline), (bytesperline*(overridepm16y-25)) >> 2, 0L);
drawline16(0,ydim-overridepm16y,xdim-1,ydim-overridepm16y,1);
drawline16(0,ydim-overridepm16y,xdim-1,ydim-overridepm16y,editorcolors[1]);
Bsprintf(tempbuf, "Mapster32 Help Mode");
printext16(9L,ydim2d-overridepm16y+9L,4,-1,tempbuf,0);
printext16(8L,ydim2d-overridepm16y+8L,12,-1,tempbuf,0);
printext16(9L,ydim2d-overridepm16y+9L,editorcolors[4],-1,tempbuf,0);
printext16(8L,ydim2d-overridepm16y+8L,editorcolors[12],-1,tempbuf,0);
enddrawing();
memset(oldpattern, 0, sizeof(char));
@ -1550,9 +1550,9 @@ ENDFOR1:
i<IHELP_NUMDISPLINES && j<helppage[curhp]->numlines; i++)
{
Bmemcpy(disptext[i], helppage[curhp]->line[j], 80);
printext16(8,ydim-overridepm16y+28+i*9,10,
printext16(8,ydim-overridepm16y+28+i*9,editorcolors[10],
(j==highlightline && curhp==highlighthp
&& totalclock-lasthighlighttime<120*5)?1:-1,
&& totalclock-lasthighlighttime<120*5)?editorcolors[1]:-1,
disptext[i],0);
}
@ -1563,7 +1563,7 @@ ENDFOR1:
overridepm16y = -1;
i=ydim16;
ydim16=ydim;
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,1);
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,editorcolors[1]);
ydim16=i;
printmessage16("");
showframe(1);
@ -1938,7 +1938,7 @@ static void PrintStatus(char *string,int num,char x,char y,char color)
{
Bsprintf(tempbuf,"%s %d",string,num);
begindrawing();
printext16(x*8,ydim16+y*8,color,-1,tempbuf,0);
printext16(x*8,ydim16+y*8,editorcolors[(int)color],-1,tempbuf,0);
enddrawing();
}
@ -1989,7 +1989,7 @@ static void ReadPaletteTable()
static void ReadGamePalette()
{
int i,fp;
int fp;
if ((fp=kopen4load("palette.dat",0)) == -1)
if ((fp=kopen4load("palette.dat",1)) == -1)
{
@ -2000,7 +2000,6 @@ static void ReadGamePalette()
}
// initprintf("Loading game palette... ");
kread(fp,GAMEpalette,768);
for (i=0;i<768;++i) GAMEpalette[i]=GAMEpalette[i];
kclose(fp);
// initprintf("success.\n");
ReadPaletteTable();
@ -6583,8 +6582,8 @@ static void Keys2d(void)
*/
Bsprintf(tempbuf, "Mapster32" VERSION);
printext16(9L,ydim2d-STATUS2DSIZ+9L,4,-1,tempbuf,0);
printext16(8L,ydim2d-STATUS2DSIZ+8L,12,-1,tempbuf,0);
printext16(9L,ydim2d-STATUS2DSIZ+9L,editorcolors[4],-1,tempbuf,0);
printext16(8L,ydim2d-STATUS2DSIZ+8L,editorcolors[12],-1,tempbuf,0);
updatesector(mousxplc,mousyplc,&cursectornum);
searchsector=cursectornum;
@ -6727,7 +6726,7 @@ static void Keys2d(void)
j = 256;
k = 90;
}
printext16(j,ydim16+32+(i*9)-k,11,-1,Help2d[i],0);
printext16(j,ydim16+32+(i*9)-k,editorcolors[11],-1,Help2d[i],0);
}
enddrawing();
}
@ -7205,6 +7204,26 @@ static void InitCustomColors(void)
/* vgapal16[9*4+0] = 63;
vgapal16[9*4+1] = 31;
vgapal16[9*4+2] = 7; */
int i;
palette_t *edcol;
/*
char vgapal16[4*256] =
{
00,00,00,00, 42,00,00,00, 00,42,00,00, 42,42,00,00, 00,00,42,00,
42,00,42,00, 00,21,42,00, 42,42,42,00, 21,21,21,00, 63,21,21,00,
21,63,21,00, 63,63,21,00, 21,21,63,00, 63,21,63,00, 21,63,63,00,
63,63,63,00
};
*/
/* editorcolors[0] = getclosestcol(0,0,0);
editorcolors[1] = getclosestcol(0,0,42);
editorcolors[2] = getclosestcol(0,42,0);
editorcolors[3] = getclosestcol(0,42,42);
editorcolors[4] = getclosestcol(42,0,0);
editorcolors[5] = getclosestcol(0,0,0);
*/
extern int getclosestcol(int r, int g, int b);
/* orange */
vgapal16[31*4+0] = 20; // blue
@ -7252,7 +7271,11 @@ static void InitCustomColors(void)
vgapal16[41*4+1] = 40;
vgapal16[41*4+2] = 48;
for (i = 0; i<256; i++)
{
edcol = (palette_t *)&vgapal16[4*i];
editorcolors[i] = getclosestcol(edcol->b,edcol->g,edcol->r);
}
}
void ExtPreSaveMap(void)
@ -8758,6 +8781,10 @@ void ExtPreCheckKeys(void) // just before drawrooms
xp1 = mulscale14(sprite[i].x-posx,zoom);
yp1 = mulscale14(sprite[i].y-posy,zoom);
if (zoom >= 256 && (sprite[i].cstat & 48) == 0)
rotatesprite((halfxdim16+xp1)<<16,(midydim16+yp1)<<16,zoom<<5,0,sprite[i].picnum,
(i+16384 == pointhighlight && totalclock&32)?8:0,sprite[i].pal,0,0,0,xdim-1,ydim16-1);
if (sprite[i].picnum == 5 /*&& zoom >= 256*/ && sprite[i].sectnum != MAXSECTORS)
{
radius = mulscale14(sprite[i].hitag,zoom);
@ -8765,7 +8792,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
if (i+16384 == pointhighlight)
if (totalclock & 32) col += (2<<2);
drawlinepat = 0xf0f0f0f0;
drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col);
drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, editorcolors[col]);
drawlinepat = 0xffffffff;
// radius = mulscale15(sprite[i].hitag,zoom);
// drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col);
@ -9454,7 +9481,7 @@ static void EditSectorData(short sectnum)
{
if (row < rowmax)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
row++;
}
keystatus[KEYSC_DOWN] = 0;
@ -9463,7 +9490,7 @@ static void EditSectorData(short sectnum)
{
if (row > 0)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
row--;
}
keystatus[KEYSC_UP] = 0;
@ -9472,7 +9499,7 @@ static void EditSectorData(short sectnum)
{
if (col == 2)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 1;
xpos = 200;
rowmax = 6;
@ -9486,7 +9513,7 @@ static void EditSectorData(short sectnum)
{
if (col == 1)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 2;
xpos = 400;
rowmax = 6;
@ -9654,14 +9681,14 @@ static void EditSectorData(short sectnum)
break;
}
}
printext16(xpos,ypos+row*8,11,1,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[1],disptext,0);
if (editval)
{
editval = 0;
}
showframe(1);
}
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[0],disptext,0);
printmessage16("");
enddrawing();
showframe(1);
@ -9691,7 +9718,7 @@ static void EditWallData(short wallnum)
{
if (row < 6)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[0],disptext,0);
row++;
}
keystatus[KEYSC_DOWN] = 0;
@ -9700,7 +9727,7 @@ static void EditWallData(short wallnum)
{
if (row > 0)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[0],disptext,0);
row--;
}
keystatus[KEYSC_UP] = 0;
@ -9783,7 +9810,7 @@ static void EditWallData(short wallnum)
}
break;
}
printext16(xpos,ypos+row*8,11,1,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[1],disptext,0);
if (editval)
{
editval = 0;
@ -9794,7 +9821,7 @@ static void EditWallData(short wallnum)
showframe(1);
}
//begindrawing();
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[0],disptext,0);
printmessage16("");
enddrawing();
showframe(1);
@ -9825,7 +9852,7 @@ static void EditSpriteData(short spritenum)
{
if (row < rowmax)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[0],disptext,0);
row++;
}
keystatus[KEYSC_DOWN] = 0;
@ -9834,7 +9861,7 @@ static void EditSpriteData(short spritenum)
{
if (row > 0)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],editorcolors[0],disptext,0);
row--;
}
keystatus[KEYSC_UP] = 0;
@ -9845,7 +9872,7 @@ static void EditSpriteData(short spritenum)
{
case 1:
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 0;
xpos = 8;
rowmax = 4;
@ -9856,7 +9883,7 @@ static void EditSpriteData(short spritenum)
break;
case 2:
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 1;
xpos = 200;
rowmax = 5;
@ -9874,7 +9901,7 @@ static void EditSpriteData(short spritenum)
{
case 0:
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 1;
xpos = 200;
rowmax = 5;
@ -9885,7 +9912,7 @@ static void EditSpriteData(short spritenum)
break;
case 1:
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 2;
xpos = 400;
rowmax = 6;
@ -10144,7 +10171,7 @@ static void EditSpriteData(short spritenum)
showframe(1);
}
begindrawing();
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
printmessage16("");
enddrawing();
showframe(1);
@ -10231,7 +10258,7 @@ static void GenSearchSprite()
keystatus[KEYSC_DOWN] = 0;
if (row < rowmax[col])
{
printext16(xpos[col],ypos+row*8,11,0,disptext,0);
printext16(xpos[col],ypos+row*8,editorcolors[11],0,disptext,0);
row++;
}
}
@ -10240,7 +10267,7 @@ static void GenSearchSprite()
keystatus[KEYSC_UP] = 0;
if (row > 0)
{
printext16(xpos[col],ypos+row*8,11,0,disptext,0);
printext16(xpos[col],ypos+row*8,editorcolors[11],0,disptext,0);
row--;
}
}
@ -10249,7 +10276,7 @@ static void GenSearchSprite()
keystatus[KEYSC_LEFT] = 0;
if (col > 0)
{
printext16(xpos[col],ypos+row*8,11,0,disptext,0);
printext16(xpos[col],ypos+row*8,editorcolors[11],0,disptext,0);
col--;
disptext[dispwidth[col]] = 0;
if (row > rowmax[col]) row = rowmax[col];
@ -10260,7 +10287,7 @@ static void GenSearchSprite()
keystatus[KEYSC_RIGHT] = 0;
if (col < 2)
{
printext16(xpos[col],ypos+row*8,11,0,disptext,0);
printext16(xpos[col],ypos+row*8,editorcolors[11],0,disptext,0);
col++;
disptext[dispwidth[col]] = 0;
if (row > rowmax[col]) row = rowmax[col];
@ -10309,7 +10336,7 @@ static void GenSearchSprite()
showframe(1);
}
// begindrawing();
printext16(xpos[col],ypos+row*8,11,0,disptext,0);
printext16(xpos[col],ypos+row*8,editorcolors[11],0,disptext,0);
printmessage16("Search sprite");
// enddrawing();
showframe(1);
@ -10347,7 +10374,7 @@ static void FuncMenuOpts(void)
do
{
// x2 =
printext16(x,y,11,0,FuncMenuStrings[i],0);
printext16(x,y,editorcolors[11],0,FuncMenuStrings[i],0);
// if (x2 > x2_max) x2_max = x2;
y += MENU_Y_SPACING;
}
@ -10356,7 +10383,7 @@ static void FuncMenuOpts(void)
// drawline16(x-1,MENU_BASE_Y-4,x-1,y,1);
// x2 =
printext16(x,MENU_BASE_Y,11,0,"Special functions",0);
printext16(x,MENU_BASE_Y,editorcolors[11],0,"Special functions",0);
// drawline16(x-1,MENU_BASE_Y-4,x2+1,MENU_BASE_Y-4,1);
// drawline16(x2_max+1,MENU_BASE_Y+16-4,x2_max+1,y-1,1);
//drawline16(x2+1,MENU_BASE_Y+16-1,x2_max+1,MENU_BASE_Y+16-1,1);
@ -10386,7 +10413,7 @@ static void FuncMenu(void)
{
if (row < rowmax)
{
printext16(xpos,ypos+row*MENU_Y_SPACING,11,0,disptext,0);
printext16(xpos,ypos+row*MENU_Y_SPACING,editorcolors[11],0,disptext,0);
row++;
}
keystatus[KEYSC_DOWN] = 0;
@ -10395,7 +10422,7 @@ static void FuncMenu(void)
{
if (row > 0)
{
printext16(xpos,ypos+row*MENU_Y_SPACING,11,0,disptext,0);
printext16(xpos,ypos+row*MENU_Y_SPACING,editorcolors[11],0,disptext,0);
row--;
}
keystatus[KEYSC_UP] = 0;
@ -10405,7 +10432,7 @@ static void FuncMenu(void)
{
/* if (col == 2)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 1;
xpos = 200;
rowmax = 6;
@ -10416,7 +10443,7 @@ static void FuncMenu(void)
else */
if (col == 1)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 0;
xpos = 8;
rowmax = 7;
@ -10431,7 +10458,7 @@ static void FuncMenu(void)
{
if (col == 0)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 1;
xpos = 200;
rowmax = 0;
@ -10441,7 +10468,7 @@ static void FuncMenu(void)
}
/* else if (col == 1)
{
printext16(xpos,ypos+row*8,11,0,disptext,0);
printext16(xpos,ypos+row*8,editorcolors[11],0,disptext,0);
col = 2;
xpos = 400;
rowmax = 6;
@ -10660,7 +10687,7 @@ static void FuncMenu(void)
showframe(1);
}
begindrawing();
printext16(xpos,ypos+row*MENU_Y_SPACING,11,0,disptext,0);
printext16(xpos,ypos+row*MENU_Y_SPACING,editorcolors[11],0,disptext,0);
enddrawing();
clearmidstatbar16();
showframe(1);

2
polymer/eduke32/source/duke3d.h
View file

@ -111,7 +111,7 @@ extern int g_scriptVersion, g_Shareware, g_gameType;
#include "namesdyn.h"
#define TICRATE g_timerTicsPerSecond
#define TICRATE (120)
#define TICSPERFRAME (TICRATE/26)
// #define GC (TICSPERFRAME*44)

2
polymer/eduke32/source/funct.h
View file

@ -156,7 +156,7 @@ extern void A_SpawnWallGlass(int i,int wallnum,int n);
extern void A_SpawnGlass(int i,int n);
extern void A_SpawnCeilingGlass(int i,int sectnum,int n);
extern void A_SpawnRandomGlass(int i,int wallnum,int n);
extern inline int GetTime(void);
extern int GetTime(void);
extern void CONFIG_GetSetupFilename(void);
extern int32 CONFIG_FunctionNameToNum(char *func);
extern char *CONFIG_FunctionNumToName(int32 func);

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

@ -13788,7 +13788,7 @@ static void G_SetupGameButtons(void)
===================
*/
inline int GetTime(void)
int GetTime(void)
{
return totalclock;
}

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

@ -79,7 +79,7 @@ int g_currentFrameRate;
char g_numVolumes = 3;
int g_timerTicsPerSecond=120;
int g_timerTicsPerSecond=TICRATE;
//fx_device device;
sound_t g_sounds[ MAXSOUNDS ];

2
polymer/eduke32/source/jmact/control.c
View file

@ -170,7 +170,7 @@ boolean CONTROL_KeyboardFunctionPressed(int32 which)
if (CONTROL_KeyMapping[which].key1 != KEYUNDEFINED && !boundkeys[CONTROL_KeyMapping[which].key1].cmd[0])
key1 = KB_KeyDown[ CONTROL_KeyMapping[which].key1 ] ? true : false;
if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED && !boundkeys[CONTROL_KeyMapping[which].key1].cmd[0])
if (CONTROL_KeyMapping[which].key2 != KEYUNDEFINED && !boundkeys[CONTROL_KeyMapping[which].key2].cmd[0])
key2 = KB_KeyDown[ CONTROL_KeyMapping[which].key2 ] ? true : false;
return (key1 | key2);