zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-09-03 14:02:42 +00:00
parent 535b8432f0
commit 33cb047a6c
3 changed files with 143 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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) #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)); 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) #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, ...); void _printmessage16(const char *fmt, ...);
#define printmessage16(fmt, ...) lastpm16time = totalclock, _printmessage16(fmt, ## __VA_ARGS__) #define printmessage16(fmt, ...) lastpm16time = totalclock, _printmessage16(fmt, ## __VA_ARGS__)

22
polymer/build/src/build.c
View file

@ -689,7 +689,9 @@ void editinput(void)
} }
} }
if (mskip)mskip=0;else if (mskip)
mskip=0;
else
{ {
if (mlook && !(unrealedlook && bstatus&(1|4))) if (mlook && !(unrealedlook && bstatus&(1|4)))
{ {
@ -1922,7 +1924,8 @@ void overheadeditor(void)
j = nextspritesect[j]; j = nextspritesect[j];
} }
} }
/*if (k == 0)*/ keystatus[0x2d] = 0; /*if (k == 0)*/
keystatus[0x2d] = 0;
printmessage16("Selected sector(s) flipped"); printmessage16("Selected sector(s) flipped");
asksave = 1; asksave = 1;
} }
@ -2040,7 +2043,8 @@ void overheadeditor(void)
j = nextspritesect[j]; j = nextspritesect[j];
} }
} }
/*if (k == 0)*/ keystatus[0x15] = 0; /*if (k == 0)*/
keystatus[0x15] = 0;
printmessage16("Selected sector(s) flipped"); printmessage16("Selected sector(s) flipped");
asksave = 1; asksave = 1;
} }
@ -5296,6 +5300,10 @@ int _getnumber256(char namestart[80], int num, int maxnumber, char sign, void *(
clearkeys(); clearkeys();
mouseb = 0;
searchx = osearchx;
searchy = osearchy;
ExtCheckKeys(); ExtCheckKeys();
if (func != NULL) 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); else Bsprintf(buffer,"%s%d",namestart,danum);
if (totalclock & 32) Bstrcat(buffer,"_ "); if (totalclock & 32) Bstrcat(buffer,"_ ");
printmessage256(buffer); printmessage256(0, 0, buffer);
showframe(1); showframe(1);
if (ch >= '0' && ch <= '9') if (ch >= '0' && ch <= '9')
@ -6318,7 +6326,7 @@ void _printmessage16(const char *fmt, ...)
enddrawing(); enddrawing();
} }
void printmessage256(char name[82]) void printmessage256(int x, int y, char *name)
{ {
char snotbuf[64]; char snotbuf[64];
int i; int i;
@ -6335,8 +6343,8 @@ void printmessage256(char name[82])
i++; i++;
} }
snotbuf[62] = 0; snotbuf[62] = 0;
printext256(2L,2L,0,-1,snotbuf,0); printext256(x+2,y+2,0,-1,snotbuf,0);
printext256(0L,0L,whitecol,-1,snotbuf,0); printext256(x,y,whitecol,-1,snotbuf,0);
} }
//Find closest point (*dax, *day) on wall (dawall) to (x, y) //Find closest point (*dax, *day) on wall (dawall) to (x, y)

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

@ -3087,6 +3087,10 @@ void getnumberptr256(char namestart[80], void *num, int bytes, int maxnumber, ch
clearkeys(); clearkeys();
mouseb = 0;
searchx = osearchx;
searchy = osearchy;
ExtCheckKeys(); ExtCheckKeys();
if (func != NULL) 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); else Bsprintf(buffer,"%s%d",namestart,danum);
if (totalclock & 32) Bstrcat(buffer,"_ "); if (totalclock & 32) Bstrcat(buffer,"_ ");
printmessage256(buffer); printmessage256(0, 0, buffer);
showframe(1); showframe(1);
if (ch >= '0' && ch <= '9') if (ch >= '0' && ch <= '9')