mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 11:10:47 +00:00
More boredom
git-svn-id: https://svn.eduke32.com/eduke32@226 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
d9e51bc8ac
commit
f752e9a873
2 changed files with 89 additions and 57 deletions
|
@ -57,8 +57,6 @@ char *Help2d[]= {
|
||||||
" '4 = MIN FRAMERATE",
|
" '4 = MIN FRAMERATE",
|
||||||
#endif
|
#endif
|
||||||
" '7 = Swap tags",
|
" '7 = Swap tags",
|
||||||
" '9 = Double size map",
|
|
||||||
" '0 = Shrink map to half size",
|
|
||||||
" X = Flip sector x",
|
" X = Flip sector x",
|
||||||
" Y = Flip sector y",
|
" Y = Flip sector y",
|
||||||
" F5 = Item count",
|
" F5 = Item count",
|
||||||
|
@ -5385,7 +5383,11 @@ void FuncMenuOpts(void)
|
||||||
printext16(8,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
|
printext16(8,ydim-STATUS2DSIZ+88,11,-1,snotbuf,0);
|
||||||
Bsprintf(snotbuf,"Scale map down");
|
Bsprintf(snotbuf,"Scale map down");
|
||||||
printext16(8,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
|
printext16(8,ydim-STATUS2DSIZ+96,11,-1,snotbuf,0);
|
||||||
|
Bsprintf(snotbuf,"Global shade divide");
|
||||||
|
printext16(8,ydim-STATUS2DSIZ+104,11,-1,snotbuf,0);
|
||||||
|
|
||||||
|
Bsprintf(snotbuf,"Global vis divide");
|
||||||
|
printext16(200,ydim-STATUS2DSIZ+48,11,-1,snotbuf,0);
|
||||||
/*
|
/*
|
||||||
Bsprintf(snotbuf," (0x%x), (0x%x)",sprite[spritenum].hitag,sprite[spritenum].lotag);
|
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,11,-1,snotbuf,0);
|
||||||
|
@ -5423,7 +5425,7 @@ void FuncMenuOpts(void)
|
||||||
void FuncMenu(void)
|
void FuncMenu(void)
|
||||||
{
|
{
|
||||||
char disptext[80];
|
char disptext[80];
|
||||||
char col=0, row=0, rowmax=6, dispwidth = 24;
|
char col=0, row=0, rowmax=7, dispwidth = 24;
|
||||||
long xpos = 8, ypos = ydim-STATUS2DSIZ+48;
|
long xpos = 8, ypos = ydim-STATUS2DSIZ+48;
|
||||||
int i = -1, j;
|
int i = -1, j;
|
||||||
char editval = 0;
|
char editval = 0;
|
||||||
|
@ -5457,56 +5459,54 @@ void FuncMenu(void)
|
||||||
}
|
}
|
||||||
keystatus[0xc8] = 0;
|
keystatus[0xc8] = 0;
|
||||||
}
|
}
|
||||||
/*
|
if (keystatus[0xcb] > 0)
|
||||||
if (keystatus[0xcb] > 0)
|
{
|
||||||
{
|
/* if (col == 2)
|
||||||
if (col == 2)
|
{
|
||||||
{
|
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
||||||
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
col = 1;
|
||||||
col = 1;
|
xpos = 200;
|
||||||
xpos = 200;
|
rowmax = 6;
|
||||||
rowmax = 6;
|
dispwidth = 24;
|
||||||
dispwidth = 24;
|
disptext[dispwidth] = 0;
|
||||||
disptext[dispwidth] = 0;
|
if (row > rowmax) row = rowmax;
|
||||||
if (row > rowmax) row = rowmax;
|
}
|
||||||
}
|
else */ if (col == 1)
|
||||||
else if (col == 1)
|
{
|
||||||
{
|
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
||||||
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
col = 0;
|
||||||
col = 0;
|
xpos = 8;
|
||||||
xpos = 8;
|
rowmax = 7;
|
||||||
rowmax = 6;
|
dispwidth = 23;
|
||||||
dispwidth = 23;
|
disptext[dispwidth] = 0;
|
||||||
disptext[dispwidth] = 0;
|
if (row > rowmax) row = rowmax;
|
||||||
if (row > rowmax) row = rowmax;
|
}
|
||||||
}
|
keystatus[0xcb] = 0;
|
||||||
keystatus[0xcb] = 0;
|
}
|
||||||
}
|
if (keystatus[0xcd] > 0)
|
||||||
if (keystatus[0xcd] > 0)
|
{
|
||||||
{
|
if (col == 0)
|
||||||
if (col == 0)
|
{
|
||||||
{
|
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
||||||
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
col = 1;
|
||||||
col = 1;
|
xpos = 200;
|
||||||
xpos = 200;
|
rowmax = 0;
|
||||||
rowmax = 6;
|
dispwidth = 24;
|
||||||
dispwidth = 24;
|
disptext[dispwidth] = 0;
|
||||||
disptext[dispwidth] = 0;
|
if (row > rowmax) row = rowmax;
|
||||||
if (row > rowmax) row = rowmax;
|
}
|
||||||
}
|
/* else if (col == 1)
|
||||||
else if (col == 1)
|
{
|
||||||
{
|
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
||||||
printext16(xpos,ypos+row*8,11,0,disptext,0);
|
col = 2;
|
||||||
col = 2;
|
xpos = 400;
|
||||||
xpos = 400;
|
rowmax = 6;
|
||||||
rowmax = 6;
|
dispwidth = 26;
|
||||||
dispwidth = 26;
|
disptext[dispwidth] = 0;
|
||||||
disptext[dispwidth] = 0;
|
if (row > rowmax) row = rowmax;
|
||||||
if (row > rowmax) row = rowmax;
|
} */
|
||||||
}
|
keystatus[0xcd] = 0;
|
||||||
keystatus[0xcd] = 0;
|
}
|
||||||
}
|
|
||||||
*/
|
|
||||||
if (keystatus[0x1c] > 0)
|
if (keystatus[0x1c] > 0)
|
||||||
{
|
{
|
||||||
keystatus[0x1c] = 0;
|
keystatus[0x1c] = 0;
|
||||||
|
@ -5608,9 +5608,7 @@ void FuncMenu(void)
|
||||||
sector[i].floorz += scale;
|
sector[i].floorz += scale;
|
||||||
}
|
}
|
||||||
for(i=0;i<MAXSPRITES;i++)
|
for(i=0;i<MAXSPRITES;i++)
|
||||||
{
|
|
||||||
sprite[i].z += scale;
|
sprite[i].z += scale;
|
||||||
}
|
|
||||||
printmessage16("Map adjusted");
|
printmessage16("Map adjusted");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5674,7 +5672,41 @@ void FuncMenu(void)
|
||||||
printmessage16("Map scaled");
|
printmessage16("Map scaled");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (row == 7)
|
||||||
|
{
|
||||||
|
for (i=Bsprintf(disptext,"Global shade divide"); i < dispwidth; i++) disptext[i] = ' ';
|
||||||
|
if (editval)
|
||||||
|
{
|
||||||
|
signed char shade;
|
||||||
|
|
||||||
|
shade=getnumber16("Shade divisor: ",1,127,1);
|
||||||
|
for(i=0;i<numsectors;i++)
|
||||||
|
{
|
||||||
|
sector[i].ceilingshade /= shade;
|
||||||
|
sector[i].floorshade /= shade;
|
||||||
|
}
|
||||||
|
for(i=0;i<numwalls;i++)
|
||||||
|
wall[i].shade /= shade;
|
||||||
|
for(i=0;i<MAXSPRITES;i++)
|
||||||
|
sprite[i].shade /= shade;
|
||||||
|
printmessage16("Shades adjusted");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
if (row == 0)
|
||||||
|
{
|
||||||
|
for (i=Bsprintf(disptext,"Global vis divide"); i < dispwidth; i++) disptext[i] = ' ';
|
||||||
|
if (editval)
|
||||||
|
{
|
||||||
|
signed char vis;
|
||||||
|
|
||||||
|
vis=getnumber16("Visibility divisor: ",1,127,0);
|
||||||
|
for(i=0;i<numsectors;i++)
|
||||||
|
sector[i].visibility /= vis;
|
||||||
|
printmessage16("Visibility adjusted");
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
printext16(xpos,ypos+row*8,11,1,disptext,0);
|
printext16(xpos,ypos+row*8,11,1,disptext,0);
|
||||||
|
|
|
@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "util_lib.h"
|
#include "util_lib.h"
|
||||||
|
|
||||||
#define VERSION " 1.4.0 beta 2"
|
#define VERSION " 1.4.0svn"
|
||||||
|
|
||||||
#define HEAD "EDuke32"VERSION" (shareware mode)"
|
#define HEAD "EDuke32"VERSION" (shareware mode)"
|
||||||
#define HEAD2 "EDuke32"VERSION
|
#define HEAD2 "EDuke32"VERSION
|
||||||
|
@ -3032,7 +3032,7 @@ void displayrest(long smoothratio)
|
||||||
minitext(320-5*12,200-i-6-6-6,tempbuf,0,26);
|
minitext(320-5*12,200-i-6-6-6,tempbuf,0,26);
|
||||||
|
|
||||||
if(ud.player_skill > 3 || (ud.multimode > 1 && !(gametype_flags[ud.coop] & GAMETYPE_FLAG_PLAYERSFRIENDLY)))
|
if(ud.player_skill > 3 || (ud.multimode > 1 && !(gametype_flags[ud.coop] & GAMETYPE_FLAG_PLAYERSFRIENDLY)))
|
||||||
Bsprintf(tempbuf,"Kills: %ld",ud.multimode>1?ps[i].frag-ps[i].fraggedself:ps[myconnectindex].actors_killed);
|
Bsprintf(tempbuf,"Kills: %ld",(ud.multimode>1 &&!(gametype_flags[ud.coop]&GAMETYPE_FLAG_PLAYERSFRIENDLY))?ps[i].frag-ps[i].fraggedself:ps[myconnectindex].actors_killed);
|
||||||
else
|
else
|
||||||
Bsprintf(tempbuf,"Kills: %ld/%ld",ps[myconnectindex].actors_killed,
|
Bsprintf(tempbuf,"Kills: %ld/%ld",ps[myconnectindex].actors_killed,
|
||||||
ps[myconnectindex].max_actors_killed>ps[myconnectindex].actors_killed?
|
ps[myconnectindex].max_actors_killed>ps[myconnectindex].actors_killed?
|
||||||
|
|
Loading…
Reference in a new issue