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

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

Browse source
This commit is contained in:
terminx 2008-09-04 23:11:48 +00:00
parent cc5e27246c
commit 898e6669ef
4 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,9 +83,9 @@ int writesetup(const char *fn); // from config.c
void editinput(void); void editinput(void);
void clearmidstatbar16(void); void clearmidstatbar16(void);
int _getnumber256(char namestart[80], int num, int maxnumber, char sign, void *(func)(int)); int _getnumber256(char *namestart, int num, int maxnumber, char sign, void *(func)(int));
#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, 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(int x, int y, char *name); void printmessage256(int x, int y, char *name);
void _printmessage16(const char *fmt, ...); void _printmessage16(const char *fmt, ...);

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

@ -612,12 +612,28 @@ void editinput(void)
getmousevalues(&mousx,&mousy,&bstatus); getmousevalues(&mousx,&mousy,&bstatus);
mousx = (mousx<<16)+mousexsurp; mousx = (mousx<<16)+mousexsurp;
mousy = (mousy<<16)+mouseysurp; mousy = (mousy<<16)+mouseysurp;
if ((unrealedlook && !mskip) &&
(((!mlook && (bstatus&2) && !(bstatus&(1|4)))) || ((bstatus&1) && !(bstatus&(2|4)))))
mlook = 3;
{ {
ldiv_t ld; ldiv_t ld;
ld = ldiv((int)(mousx), (1<<16)); mousx = ld.quot; mousexsurp = ld.rem; if (mlook)
ld = ldiv((int)(mousy), (1<<16)); mousy = ld.quot; mouseysurp = ld.rem; {
ld = ldiv((int)(mousx), (1<<16)/(msens*0.5f)); mousx = ld.quot; mousexsurp = ld.rem;
ld = ldiv((int)(mousy), (1<<16)/(msens*0.25f)); mousy = ld.quot; mouseysurp = ld.rem;
}
else
{
ld = ldiv((int)(mousx), (1<<16)/msens); mousx = ld.quot; mousexsurp = ld.rem;
ld = ldiv((int)(mousy), (1<<16)/msens); mousy = ld.quot; mouseysurp = ld.rem;
}
} }
if (mlook == 3)
mlook = 0;
// UnrealEd: // UnrealEd:
// rmb: mouselook // rmb: mouselook
// lbm: x:turn y:fwd/back local x // lbm: x:turn y:fwd/back local x
@ -628,11 +644,9 @@ void editinput(void)
{ {
if ((bstatus&1) && !(bstatus&(2|4))) if ((bstatus&1) && !(bstatus&(2|4)))
{ {
ang += (mousx>>1)*msens; ang += mousx;
if (mousx && !(mousx>>1)) xvect = -((mousy*(int)sintable[(ang+2560)&2047])<<(3+pk_uedaccel));
ang++; yvect = -((mousy*(int)sintable[(ang+2048)&2047])<<(3+pk_uedaccel));
xvect = -((mousy*(int)sintable[(ang+2560)&2047])<<pk_uedaccel);
yvect = -((mousy*(int)sintable[(ang+2048)&2047])<<pk_uedaccel);
if (noclip) if (noclip)
{ {
@ -695,13 +709,13 @@ void editinput(void)
{ {
if (mlook && !(unrealedlook && bstatus&(1|4))) if (mlook && !(unrealedlook && bstatus&(1|4)))
{ {
ang += (mousx>>1)*msens; ang += mousx;
horiz -= (mousy>>2)*msens; horiz -= mousy;
if (mousy && !(mousy>>2)) // if (mousy && !(mousy/4))
horiz--; // horiz--;
if (mousx && !(mousx>>1)) // if (mousx && !(mousx/2))
ang++; // ang++;
if (horiz > 299) if (horiz > 299)
horiz = 299; horiz = 299;
if (horiz < -99) if (horiz < -99)
@ -1462,7 +1476,7 @@ void overheadeditor(void)
// printmessage16("Version: "VERSION); // printmessage16("Version: "VERSION);
// drawline16(0,ydim-1-20,xdim-1,ydim-1-20,1); // drawline16(0,ydim-1-20,xdim-1,ydim-1-20,1);
drawline16(256,ydim-1-20,256,ydim-1,1); // drawline16(256,ydim-1-20,256,ydim-1,1);
ydim16 = ydim-STATUS2DSIZ; ydim16 = ydim-STATUS2DSIZ;
enddrawing(); //}}} enddrawing(); //}}}
@ -1530,8 +1544,8 @@ void overheadeditor(void)
ld = ldiv((int)(mousx), (1<<16)); mousx = ld.quot; mousexsurp = ld.rem; ld = ldiv((int)(mousx), (1<<16)); mousx = ld.quot; mousexsurp = ld.rem;
ld = ldiv((int)(mousy), (1<<16)); mousy = ld.quot; mouseysurp = ld.rem; ld = ldiv((int)(mousy), (1<<16)); mousy = ld.quot; mouseysurp = ld.rem;
} }
searchx += mousx*msens; searchx += mousx;
searchy += mousy*msens; searchy += mousy;
if (searchx < 8) searchx = 8; if (searchx < 8) searchx = 8;
if (searchx > xdim-8-1) searchx = xdim-8-1; if (searchx > xdim-8-1) searchx = xdim-8-1;
if (searchy < 8) searchy = 8; if (searchy < 8) searchy = 8;
@ -5216,7 +5230,7 @@ int numloopsofsector(short sectnum)
return(numloops); return(numloops);
} }
int _getnumber16(char namestart[80], int num, int maxnumber, char sign, void *(func)(int)) int _getnumber16(char *namestart, int num, int maxnumber, char sign, void *(func)(int))
{ {
char buffer[80], ch; char buffer[80], ch;
int n, danum, oldnum; int n, danum, oldnum;
@ -5273,7 +5287,7 @@ int _getnumber16(char namestart[80], int num, int maxnumber, char sign, void *(f
return(oldnum); return(oldnum);
} }
int _getnumber256(char namestart[80], int num, int maxnumber, char sign, void *(func)(int)) int _getnumber256(char *namestart, int num, int maxnumber, char sign, void *(func)(int))
{ {
char buffer[80], ch; char buffer[80], ch;
int n, danum, oldnum; int n, danum, oldnum;
@ -6021,7 +6035,7 @@ void printcoords16(int posxe, int posye, short ange)
} }
snotbuf[46] = 0; snotbuf[46] = 0;
printext16(264, ydim-STATUS2DSIZ+128+2, 9+m, 0, snotbuf,0); printext16(264, ydim-STATUS2DSIZ+128, 9+m, 0, snotbuf,0);
} }
void updatenumsprites(void) void updatenumsprites(void)

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

@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h> #include <windows.h>
#endif #endif
#define BUILDDATE " 20080902" #define BUILDDATE " 20080904"
#define VERSION " 1.2.0devel" #define VERSION " 1.2.0devel"
static int floor_over_floor; static int floor_over_floor;
@ -1528,6 +1528,9 @@ ENDFOR1:
} }
clearmidstatbar16(); clearmidstatbar16();
if (curhp < helppage[0]->numlines) if (curhp < helppage[0]->numlines)
{ {
printmessage16(helppage[0]->line[curhp]); printmessage16(helppage[0]->line[curhp]);
@ -1543,7 +1546,7 @@ ENDFOR1:
i<IHELP_NUMDISPLINES && j<helppage[curhp]->numlines; i++) i<IHELP_NUMDISPLINES && j<helppage[curhp]->numlines; i++)
{ {
Bmemcpy(disptext[i], helppage[curhp]->line[j], 80); Bmemcpy(disptext[i], helppage[curhp]->line[j], 80);
printext16(8,ydim-overridepm16y+28+i*9,11, printext16(8,ydim-overridepm16y+28+i*9,15,
(j==highlightline && curhp==highlighthp (j==highlightline && curhp==highlighthp
&& totalclock-lasthighlighttime<120*5)?1:-1, && totalclock-lasthighlighttime<120*5)?1:-1,
disptext[i],0); disptext[i],0);
@ -3023,7 +3026,8 @@ void drawtileinfo(char *title,int x,int y,int picnum,int shade,int pal,int cstat
printext256(x,y+i*7,whitecol,-1,buf,j); printext256(x,y+i*7,whitecol,-1,buf,j);
enddrawing(); enddrawing();
} }
int snap=0;int saveval1,saveval2,saveval3; int snap=0;
int saveval1,saveval2,saveval3;
static inline void getnumber_dochar(char *ptr, int num) static inline void getnumber_dochar(char *ptr, int num)
{ {
@ -3045,7 +3049,7 @@ static inline void getnumber_doint64(int64 *ptr, int num)
*ptr = (int64) num; *ptr = (int64) num;
} }
void getnumberptr256(char namestart[80], void *num, int bytes, int maxnumber, char sign, void *(func)(int)) void getnumberptr256(char *namestart, void *num, int bytes, int maxnumber, char sign, void *(func)(int))
{ {
char buffer[80], ch; char buffer[80], ch;
int n, danum = 0, oldnum; int n, danum = 0, oldnum;

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

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// this is checked against http://eduke32.com/VERSION // this is checked against http://eduke32.com/VERSION
#define BUILDDATE " 20080902" #define BUILDDATE " 20080904"
#define APPNAME "EDuke32" #define APPNAME "EDuke32"
#define VERSION " 1.5.0devel" #define VERSION " 1.5.0devel"
#define HEAD2 APPNAME VERSION BUILDDATE #define HEAD2 APPNAME VERSION BUILDDATE