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@1052 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
535b8432f0
commit
33cb047a6c
3 changed files with 143 additions and 131 deletions
|
@ -87,7 +87,7 @@ int _getnumber256(char namestart[80], int num, int maxnumber, char sign, void *(
|
|||
#define getnumber256(namestart, num, maxnumber, sign) _getnumber256(namestart, num, maxnumber, sign, NULL)
|
||||
int _getnumber16(char namestart[80], int num, int maxnumber, char sign, void *(func)(int));
|
||||
#define getnumber16(namestart, num, maxnumber, sign) _getnumber16(namestart, num, maxnumber, sign, NULL)
|
||||
void printmessage256(char name[82]);
|
||||
void printmessage256(int x, int y, char *name);
|
||||
void _printmessage16(const char *fmt, ...);
|
||||
|
||||
#define printmessage16(fmt, ...) lastpm16time = totalclock, _printmessage16(fmt, ## __VA_ARGS__)
|
||||
|
|
|
@ -260,7 +260,7 @@ static int osdcmd_vidmode(const osdfuncparm_t *parm)
|
|||
|
||||
ydim16 = ydim;
|
||||
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,1);
|
||||
/* drawline16(0,ydim-1,xdim-1,ydim-1,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);
|
||||
drawline16(0,ydim-STATUS2DSIZ+24,xdim-1,ydim-STATUS2DSIZ+24,1);
|
||||
|
@ -689,10 +689,12 @@ void editinput(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (mskip)mskip=0;else
|
||||
if (mskip)
|
||||
mskip=0;
|
||||
else
|
||||
{
|
||||
if (mlook && !(unrealedlook && bstatus&(1|4)))
|
||||
{
|
||||
{
|
||||
ang += (mousx>>1)*msens;
|
||||
horiz -= (mousy>>2)*msens;
|
||||
|
||||
|
@ -713,7 +715,7 @@ void editinput(void)
|
|||
osearchy = searchy-mousy;
|
||||
}
|
||||
else if (!(unrealedlook && (bstatus&(1|2|4))))
|
||||
{
|
||||
{
|
||||
osearchx = searchx;
|
||||
osearchy = searchy;
|
||||
searchx += mousx;
|
||||
|
@ -1447,7 +1449,7 @@ void overheadeditor(void)
|
|||
|
||||
ydim16 = ydim;
|
||||
drawline16(0,ydim-STATUS2DSIZ,xdim-1,ydim-STATUS2DSIZ,1);
|
||||
/* drawline16(0,ydim-1,xdim-1,ydim-1,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);
|
||||
drawline16(0,ydim-STATUS2DSIZ+24,xdim-1,ydim-STATUS2DSIZ+24,1);
|
||||
|
@ -1922,7 +1924,8 @@ void overheadeditor(void)
|
|||
j = nextspritesect[j];
|
||||
}
|
||||
}
|
||||
/*if (k == 0)*/ keystatus[0x2d] = 0;
|
||||
/*if (k == 0)*/
|
||||
keystatus[0x2d] = 0;
|
||||
printmessage16("Selected sector(s) flipped");
|
||||
asksave = 1;
|
||||
}
|
||||
|
@ -2040,7 +2043,8 @@ void overheadeditor(void)
|
|||
j = nextspritesect[j];
|
||||
}
|
||||
}
|
||||
/*if (k == 0)*/ keystatus[0x15] = 0;
|
||||
/*if (k == 0)*/
|
||||
keystatus[0x15] = 0;
|
||||
printmessage16("Selected sector(s) flipped");
|
||||
asksave = 1;
|
||||
}
|
||||
|
@ -5296,6 +5300,10 @@ int _getnumber256(char namestart[80], int num, int maxnumber, char sign, void *(
|
|||
|
||||
clearkeys();
|
||||
|
||||
mouseb = 0;
|
||||
searchx = osearchx;
|
||||
searchy = osearchy;
|
||||
|
||||
ExtCheckKeys();
|
||||
|
||||
if (func != NULL)
|
||||
|
@ -5303,7 +5311,7 @@ int _getnumber256(char namestart[80], int num, int maxnumber, char sign, void *(
|
|||
else Bsprintf(buffer,"%s%d",namestart,danum);
|
||||
|
||||
if (totalclock & 32) Bstrcat(buffer,"_ ");
|
||||
printmessage256(buffer);
|
||||
printmessage256(0, 0, buffer);
|
||||
showframe(1);
|
||||
|
||||
if (ch >= '0' && ch <= '9')
|
||||
|
@ -6318,7 +6326,7 @@ void _printmessage16(const char *fmt, ...)
|
|||
enddrawing();
|
||||
}
|
||||
|
||||
void printmessage256(char name[82])
|
||||
void printmessage256(int x, int y, char *name)
|
||||
{
|
||||
char snotbuf[64];
|
||||
int i;
|
||||
|
@ -6335,8 +6343,8 @@ void printmessage256(char name[82])
|
|||
i++;
|
||||
}
|
||||
snotbuf[62] = 0;
|
||||
printext256(2L,2L,0,-1,snotbuf,0);
|
||||
printext256(0L,0L,whitecol,-1,snotbuf,0);
|
||||
printext256(x+2,y+2,0,-1,snotbuf,0);
|
||||
printext256(x,y,whitecol,-1,snotbuf,0);
|
||||
}
|
||||
|
||||
//Find closest point (*dax, *day) on wall (dawall) to (x, y)
|
||||
|
|
|
@ -3087,6 +3087,10 @@ void getnumberptr256(char namestart[80], void *num, int bytes, int maxnumber, ch
|
|||
|
||||
clearkeys();
|
||||
|
||||
mouseb = 0;
|
||||
searchx = osearchx;
|
||||
searchy = osearchy;
|
||||
|
||||
ExtCheckKeys();
|
||||
|
||||
if (func != NULL)
|
||||
|
@ -3094,7 +3098,7 @@ void getnumberptr256(char namestart[80], void *num, int bytes, int maxnumber, ch
|
|||
else Bsprintf(buffer,"%s%d",namestart,danum);
|
||||
|
||||
if (totalclock & 32) Bstrcat(buffer,"_ ");
|
||||
printmessage256(buffer);
|
||||
printmessage256(0, 0, buffer);
|
||||
showframe(1);
|
||||
|
||||
if (ch >= '0' && ch <= '9')
|
||||
|
|
Loading…
Reference in a new issue