mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@753 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx
parent
b0a2d52771
commit
59b8d7b757
6 changed files with 98 additions and 75 deletions
|
|
@ -7554,7 +7554,7 @@ void showsectordata(short sectnum)
|
|||
{
|
||||
char snotbuf[80];
|
||||
|
||||
Bsprintf(snotbuf,"Sector %d",sectnum);
|
||||
Bsprintf(snotbuf,"Sector %d (F7 to edit)",sectnum);
|
||||
printext16(8,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
|
||||
Bsprintf(snotbuf,"Firstwall: %d",sector[sectnum].wallptr);
|
||||
printext16(8,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
|
||||
|
|
@ -7611,7 +7611,7 @@ void showwalldata(short wallnum)
|
|||
int dax, day, dist;
|
||||
char snotbuf[80];
|
||||
|
||||
Bsprintf(snotbuf,"Wall %d",wallnum);
|
||||
Bsprintf(snotbuf,"Wall %d (F8 to edit)",wallnum);
|
||||
printext16(8,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
|
||||
Bsprintf(snotbuf,"X-coordinate: %d",wall[wallnum].x);
|
||||
printext16(8,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
|
||||
|
|
@ -7669,7 +7669,7 @@ void showspritedata(short spritenum)
|
|||
{
|
||||
char snotbuf[80];
|
||||
|
||||
Bsprintf(snotbuf,"Sprite %d",spritenum);
|
||||
Bsprintf(snotbuf,"Sprite %d (F8 to edit)",spritenum);
|
||||
printext16(8,ydim-STATUS2DSIZ+32,11,-1,snotbuf,0);
|
||||
Bsprintf(snotbuf,"X-coordinate: %d",sprite[spritenum].x);
|
||||
printext16(8,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ int writesetup(const char *fn)
|
|||
"; Turning deceleration\n"
|
||||
"turndecel = %d\n"
|
||||
"\n"
|
||||
"; Autosave map interval (minutes)\n"
|
||||
"; Autosave map interval (seconds)\n"
|
||||
"autosave = %d\n"
|
||||
"\n"
|
||||
#if 1
|
||||
|
|
|
|||
|
|
@ -2676,14 +2676,13 @@ static void Keys3d(void)
|
|||
Bsprintf(lines[num++],"Repeat: %3d, %3d",wall[searchwall].xrepeat,wall[searchwall].yrepeat);
|
||||
Bsprintf(lines[num++],"Overpic: %3d",wall[searchwall].overpicnum);
|
||||
lines[num++][0]=0;
|
||||
if (!getmessageleng)
|
||||
{
|
||||
if (getmessageleng)
|
||||
break;
|
||||
Bsprintf(lines[num++],"^251Wall %d^31",searchwall);
|
||||
if (wall[searchwall].nextsector!=-1)
|
||||
Bsprintf(lines[num++],"LoHeight:%d, HiHeight:%d, Length:%d",height1,height3,dist);
|
||||
else
|
||||
Bsprintf(lines[num++],"Height:%d, Length:%d",height2,dist);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
drawtileinfo("Current",WIND1X,WIND1Y,sector[searchsector].ceilingpicnum,sector[searchsector].ceilingshade,
|
||||
|
|
@ -2694,11 +2693,10 @@ static void Keys3d(void)
|
|||
Bsprintf(lines[num++],"CeilingZ: %d",sector[searchsector].ceilingz);
|
||||
Bsprintf(lines[num++],"Slope: %d",sector[searchsector].ceilingheinum);
|
||||
lines[num++][0]=0;
|
||||
if (!getmessageleng)
|
||||
{
|
||||
if (getmessageleng)
|
||||
break;
|
||||
Bsprintf(lines[num++],"^251Sector %d^31 ceiling Lotag:%s",searchsector,ExtGetSectorCaption(searchsector));
|
||||
Bsprintf(lines[num++],"Height: %d, Visibility:%d",height2,sector[searchsector].visibility);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
drawtileinfo("Current",WIND1X,WIND1Y,sector[searchsector].floorpicnum,sector[searchsector].floorshade,
|
||||
|
|
@ -2709,11 +2707,10 @@ static void Keys3d(void)
|
|||
Bsprintf(lines[num++],"FloorZ: %d",sector[searchsector].floorz);
|
||||
Bsprintf(lines[num++],"Slope: %d",sector[searchsector].floorheinum);
|
||||
lines[num++][0]=0;
|
||||
if (!getmessageleng)
|
||||
{
|
||||
if (getmessageleng)
|
||||
break;
|
||||
Bsprintf(lines[num++],"^251Sector %d^31 floor Lotag:%s",searchsector,ExtGetSectorCaption(searchsector));
|
||||
Bsprintf(lines[num++],"Height:%d, Visibility:%d",height2,sector[searchsector].visibility);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
drawtileinfo("Current",WIND1X,WIND1Y,sprite[searchwall].picnum,sprite[searchwall].shade,
|
||||
|
|
@ -2725,8 +2722,8 @@ static void Keys3d(void)
|
|||
Bsprintf(lines[num++],"PosZ: "" %d",sprite[searchwall].z);// prevents tab character
|
||||
lines[num++][0]=0;
|
||||
|
||||
if (!getmessageleng)
|
||||
{
|
||||
if (getmessageleng)
|
||||
break;
|
||||
if (strlen(names[sprite[searchwall].picnum]) > 0)
|
||||
{
|
||||
if (sprite[searchwall].picnum==SECTOREFFECTOR)
|
||||
|
|
@ -2735,7 +2732,6 @@ static void Keys3d(void)
|
|||
}
|
||||
else Bsprintf(lines[num++],"^251Sprite %d^31, picnum %d",searchwall,sprite[searchwall].picnum);
|
||||
Bsprintf(lines[num++],"Elevation:%d",getflorzofslope(searchsector,sprite[searchwall].x,sprite[searchwall].y)-sprite[searchwall].z);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -5598,6 +5594,7 @@ static void Keys2d(void)
|
|||
char col;
|
||||
|
||||
int repeatcountx=0,repeatcounty=0,smooshyalign,changedir;
|
||||
static int opointhighlight=0, olinehighlight=0, ocursectornum=0;
|
||||
/*
|
||||
for(i=0;i<0x50;i++)
|
||||
{if(keystatus[i]==1) {Bsprintf(tempbuf,"key %d",i); printmessage16(tempbuf);
|
||||
|
|
@ -5642,7 +5639,31 @@ static void Keys2d(void)
|
|||
else _printmessage16("");
|
||||
}
|
||||
|
||||
if (opointhighlight != pointhighlight || olinehighlight != linehighlight || ocursectornum != cursectornum)
|
||||
{
|
||||
if (pointhighlight >= 16384)
|
||||
{
|
||||
i = pointhighlight-16384;
|
||||
clearmidstatbar16();
|
||||
showspritedata((short)i);
|
||||
}
|
||||
else if ((linehighlight >= 0) && (sectorofwall(linehighlight) == cursectornum))
|
||||
{
|
||||
clearmidstatbar16();
|
||||
showwalldata((short)linehighlight);
|
||||
}
|
||||
else if (cursectornum >= 0)
|
||||
{
|
||||
clearmidstatbar16();
|
||||
showsectordata((short)cursectornum);
|
||||
}
|
||||
opointhighlight = pointhighlight;
|
||||
olinehighlight = linehighlight;
|
||||
ocursectornum = cursectornum;
|
||||
}
|
||||
|
||||
begindrawing();
|
||||
|
||||
for (i=0;i<numsprites;i++) // Game specific 2D sprite stuff goes here. Drawn on top of everything else.
|
||||
{
|
||||
xp1 = mulscale14(sprite[i].x-posx,zoom);
|
||||
|
|
@ -5651,9 +5672,9 @@ static void Keys2d(void)
|
|||
if (sprite[i].picnum == 5 /*&& zoom >= 256*/ && sprite[i].sectnum != MAXSECTORS)
|
||||
{
|
||||
radius = mulscale15(sprite[i].hitag,zoom);
|
||||
col = 6;
|
||||
col = 14;
|
||||
if (i+16384 == pointhighlight)
|
||||
if (totalclock & 32) col += (2<<2);
|
||||
if (totalclock & 32) col -= (2<<2);
|
||||
drawlinepat = 0xf0f0f0f0;
|
||||
drawcircle16(halfxdim16+xp1, midydim16+yp1, radius, col);
|
||||
drawlinepat = 0xffffffff;
|
||||
|
|
@ -7312,7 +7333,7 @@ int ExtInit(void)
|
|||
getmessagetimeoff = 0;
|
||||
|
||||
Bstrcpy(apptitle, "Mapster32"VERSION"");
|
||||
autosavetimer = totalclock+120*autosave*60;
|
||||
autosavetimer = totalclock+120*autosave;
|
||||
|
||||
#if defined(_WIN32) && defined(DUKEOSD)
|
||||
OSD_SetFunctions(
|
||||
|
|
@ -7544,7 +7565,7 @@ static void Keys2d3d(void)
|
|||
if (keystatus[KEYSC_QUOTE] && keystatus[KEYSC_A]) // ' a
|
||||
{
|
||||
keystatus[KEYSC_A] = 0;
|
||||
autosave=autosave?0:3;
|
||||
autosave=autosave?0:180; // 3 minutes
|
||||
if (autosave) message("Autosave ON");
|
||||
else message("Autosave OFF");
|
||||
}
|
||||
|
|
@ -7567,7 +7588,7 @@ static void Keys2d3d(void)
|
|||
|
||||
if ((totalclock > autosavetimer) && (autosave))
|
||||
{
|
||||
if (asksave)
|
||||
if (asksave == 1)
|
||||
{
|
||||
fixspritesectors(); //Do this before saving!
|
||||
// updatesector(startposx,startposy,&startsectnum);
|
||||
|
|
@ -7575,8 +7596,9 @@ static void Keys2d3d(void)
|
|||
saveboard("autosave.map",&startposx,&startposy,&startposz,&startang,&startsectnum);
|
||||
ExtSaveMap("autosave.map");
|
||||
message("Board autosaved to AUTOSAVE.MAP");
|
||||
asksave = 2;
|
||||
}
|
||||
autosavetimer = totalclock+120*autosave*60;
|
||||
autosavetimer = totalclock+120*autosave;
|
||||
}
|
||||
|
||||
if (eitherCTRL) //CTRL
|
||||
|
|
@ -7692,7 +7714,7 @@ static void Keys2d3d(void)
|
|||
{
|
||||
// charsperline = 64;
|
||||
//if (dimensionmode[snum] == 2) charsperline = 80;
|
||||
/* if (qsetmode == 200)
|
||||
/* if (qsetmode == 200)
|
||||
{
|
||||
for (i=0;i<=getmessageleng;i+=charsperline)
|
||||
{
|
||||
|
|
@ -7712,7 +7734,8 @@ static void Keys2d3d(void)
|
|||
enddrawing();
|
||||
}
|
||||
}
|
||||
else */ if (qsetmode != 200)
|
||||
else */
|
||||
if (qsetmode != 200)
|
||||
printmessage16(getmessage);
|
||||
if (totalclock > getmessagetimeoff)
|
||||
getmessageleng = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue