zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-28 18:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON_SIZETO fix and more player setup menu changes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@62 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-18 21:18:30 +00:00
parent 0d3b0ed600
commit d8334b5444
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/game.c
View file

@ -2514,7 +2514,7 @@ void drawoverheadmap(long cposx, long cposy, long czoom, short cang)
else if(j > (65536<<1)) j = (65536<<1); else if(j > (65536<<1)) j = (65536<<1);
rotatesprite((x1<<4)+(xdim<<15),(y1<<4)+(ydim<<15),j, rotatesprite((x1<<4)+(xdim<<15),(y1<<4)+(ydim<<15),j,
daang,i,sprite[ps[p].i].shade,sprite[ps[p].i].pal, daang,i,sprite[ps[p].i].shade,/*sprite[ps[p].i].pal*/sector[ps[p].cursectnum].floorpal,
(sprite[ps[p].i].cstat&2)>>1,windowx1,windowy1,windowx2,windowy2); (sprite[ps[p].i].cstat&2)>>1,windowx1,windowy1,windowx2,windowy2);
} }
} }

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

@ -3683,14 +3683,16 @@ char parse(void)
case CON_SIZETO: case CON_SIZETO:
insptr++; insptr++;
j = (*(insptr++)-g_sp->xrepeat)<<1; j = (*insptr++-g_sp->xrepeat)<<1;
g_sp->xrepeat += ksgn(j); g_sp->xrepeat += ksgn(j);
if( ( g_sp->picnum == APLAYER && g_sp->yrepeat < 36 ) || *insptr++ < g_sp->yrepeat || ((g_sp->yrepeat*(tilesizy[g_sp->picnum]+8))<<2) < (hittype[g_i].floorz - hittype[g_i].ceilingz) ) if( ( g_sp->picnum == APLAYER && g_sp->yrepeat < 36 ) || *insptr < g_sp->yrepeat || ((g_sp->yrepeat*(tilesizy[g_sp->picnum]+8))<<2) < (hittype[g_i].floorz - hittype[g_i].ceilingz) )
{ {
j = ((*insptr)-g_sp->yrepeat)<<1; j = ((*insptr)-g_sp->yrepeat)<<1;
if( klabs(j) ) g_sp->yrepeat += ksgn(j); if( klabs(j) ) g_sp->yrepeat += ksgn(j);
} }
insptr++;
break; break;
case CON_SIZEAT: case CON_SIZEAT:

16
polymer/eduke32/source/menus.c
View file

@ -611,10 +611,10 @@ void menus(void)
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
menutext(160,24,0,0,"PLAYER SETUP"); menutext(160,24,0,0,"PLAYER SETUP");
rotatesprite((280)<<16,(35+(tilesizy[APLAYER]>>1))<<16,49152L,0,1426,0,ud.color,10,0,0,xdim-1,ydim-1); rotatesprite((280)<<16,(37+(tilesizy[APLAYER]>>1))<<16,49152L,0,1426,0,ud.color,10,0,0,xdim-1,ydim-1);
if (current_menu == 20002) { if (current_menu == 20002) {
x = probe(46,50,20,4); x = probe(46,50,16,4);
switch(x) { switch(x) {
case -1: case -1:
cmenu(202); cmenu(202);
@ -666,7 +666,7 @@ void menus(void)
} }
menutext(40,50,0,0,"NAME"); menutext(40,50,0,0,"NAME");
menutext(40,50+20,0,0,"COLOR"); menutext(40,50+16,0,0,"COLOR");
{ {
int ud_color = -1, aaim = -1, ud_weaponswitch = -1; int ud_color = -1, aaim = -1, ud_weaponswitch = -1;
@ -681,18 +681,18 @@ void menus(void)
if(ud_color != ud.color || aaim != AutoAim || ud_weaponswitch != ud.weaponswitch) if(ud_color != ud.color || aaim != AutoAim || ud_weaponswitch != ud.weaponswitch)
updatenames(); updatenames();
} }
menutext(40,50+20+20,0,0,"AUTO AIM"); menutext(40,50+16+16,0,0,"AUTO AIM");
menutext(40,50+20+20+20,0,0,"WEAPON SWITCH"); menutext(40,50+16+16+16,0,0,"WEAPON SWITCH");
if (current_menu == 20002) { if (current_menu == 20002) {
gametext(200,50-9,myname,0,2+8+16); } gametext(200,50-9,myname,0,2+8+16); }
{ char *s[] = { "Auto","","","","","","","","","Blue","Dk red","Green","Gray","Dk gray","Dk green","Brown", { char *s[] = { "Auto","","","","","","","","","Blue","Dk red","Green","Gray","Dk gray","Dk green","Brown",
"Dk blue","","","","","Red","","Yellow","","" }; "Dk blue","","","","","Red","","Yellow","","" };
gametext(200,50+20-9,s[ud.color],0,2+8+16); } gametext(200,50+16-9,s[ud.color],0,2+8+16); }
{ char *s[] = { "Off", "Full", "Hitscan" }; { char *s[] = { "Off", "Full", "Hitscan" };
gametext(200,50+20+20-9,s[AutoAim],0,2+8+16); } gametext(200,50+16+16-9,s[AutoAim],0,2+8+16); }
{ char *s[] = { "Off", "Pickup", "Empty", "Both" }; { char *s[] = { "Off", "Pickup", "Empty", "Both" };
gametext(200,50+20+20+20-9,s[ud.weaponswitch],0,2+8+16); } gametext(200,50+16+16+16-9,s[ud.weaponswitch],0,2+8+16); }
break; break;
case 20010: case 20010: