Menu stuff

git-svn-id: https://svn.eduke32.com/eduke32@6606 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-01-28 04:30:57 +00:00
parent 7718d661a0
commit 6ffcd671fc

View file

@ -1160,22 +1160,24 @@ void G_DisplayRest(int32_t smoothratio)
uint8_t crosshair_pal = CROSSHAIR_PAL; uint8_t crosshair_pal = CROSSHAIR_PAL;
uint32_t crosshair_o = 1|2; uint32_t crosshair_o = 1|2;
uint32_t crosshair_scale = divscale16(ud.crosshairscale, 100);
auto const oyxaspect = yxaspect; auto const oyxaspect = yxaspect;
if (KXDWN) if (KXDWN)
{ {
crosshair_scale >>= 1;
crosshair_pal = 0; crosshair_pal = 0;
crosshair_o |= 1024; crosshair_o |= 1024;
setaspect(viewingrange, 65536); setaspect(viewingrange, 65536);
} }
rotatesprite_win(crosshairpos.x-(g_player[myconnectindex].ps->look_ang<<15), crosshairpos.y, divscale16(ud.crosshairscale, 100), rotatesprite_win(crosshairpos.x-(g_player[myconnectindex].ps->look_ang<<15), crosshairpos.y, crosshair_scale,
0, a, 0, crosshair_pal, crosshair_o); 0, a, 0, crosshair_pal, crosshair_o);
#ifdef GEKKO #ifdef GEKKO
if ((g_player[myconnectindex].ps->gm&MODE_MENU) == 0 && readmouseabsxy(&crosshairpos, &mouseabs)) if ((g_player[myconnectindex].ps->gm&MODE_MENU) == 0 && readmouseabsxy(&crosshairpos, &mouseabs))
rotatesprite_win(crosshairpos.x, crosshairpos.y, divscale16(ud.crosshairscale, 100), 0, a, 0, crosshair_pal, crosshair_o); rotatesprite_win(crosshairpos.x, crosshairpos.y, crosshair_scale, 0, a, 0, crosshair_pal, crosshair_o);
#endif #endif
if (KXDWN) if (KXDWN)