diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 1935b6d30..1ff6b8fdc 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -2514,7 +2514,7 @@ void drawoverheadmap(long cposx, long cposy, long czoom, short cang) else if(j > (65536<<1)) j = (65536<<1); 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); } } diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index ccfd105c6..82ea3c979 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -3683,14 +3683,16 @@ char parse(void) case CON_SIZETO: insptr++; - j = (*(insptr++)-g_sp->xrepeat)<<1; + j = (*insptr++-g_sp->xrepeat)<<1; 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; if( klabs(j) ) g_sp->yrepeat += ksgn(j); } + insptr++; + break; case CON_SIZEAT: diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index b76c4a2f7..8f862e2c0 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -611,10 +611,10 @@ void menus(void) rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); 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) { - x = probe(46,50,20,4); + x = probe(46,50,16,4); switch(x) { case -1: cmenu(202); @@ -666,7 +666,7 @@ void menus(void) } 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; @@ -681,18 +681,18 @@ void menus(void) if(ud_color != ud.color || aaim != AutoAim || ud_weaponswitch != ud.weaponswitch) updatenames(); } - menutext(40,50+20+20,0,0,"AUTO AIM"); - menutext(40,50+20+20+20,0,0,"WEAPON SWITCH"); + menutext(40,50+16+16,0,0,"AUTO AIM"); + menutext(40,50+16+16+16,0,0,"WEAPON SWITCH"); if (current_menu == 20002) { gametext(200,50-9,myname,0,2+8+16); } { char *s[] = { "Auto","","","","","","","","","Blue","Dk red","Green","Gray","Dk gray","Dk green","Brown", "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" }; - 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" }; - 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; case 20010: