diff --git a/src/hu_stuff.c b/src/hu_stuff.c index d105edebc..87773a2de 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2000,8 +2000,6 @@ static void HU_DrawChat(void) // For anyone who, for some godforsaken reason, likes oldchat. - - static void HU_DrawChat_Old(void) { INT32 t = 0, c = 0, y = HU_INPUTY; @@ -2072,164 +2070,6 @@ static void HU_DrawChat_Old(void) } #endif -// draw the Crosshair, at the exact center of the view. -// -// Crosshairs are pre-cached at HU_Init - -/*static inline void HU_DrawCrosshair(void) -{ - INT32 i, x, y; - - i = cv_crosshair.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[0]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); -} - -static inline void HU_DrawCrosshair2(void) -{ - INT32 i, x, y; - - i = cv_crosshair2.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[1]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - if (splitscreen) - { - if (splitscreen > 1) -#ifdef HWRENDER - if (rendermode != render_soft) - x += (INT32)gr_viewwidth; - else -#endif - x += viewwidth; - else - { -#ifdef HWRENDER - if (rendermode != render_soft) - y += (INT32)gr_viewheight; - else -#endif - y += viewheight; - } - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } -} - -static inline void HU_DrawCrosshair3(void) -{ - INT32 i, x, y; - - i = cv_crosshair3.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[2]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - if (splitscreen > 1) - { -#ifdef HWRENDER - if (rendermode != render_soft) - y += (INT32)gr_viewheight; - else -#endif - y += viewheight; - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } -} - -static inline void HU_DrawCrosshair4(void) -{ - INT32 i, x, y; - - i = cv_crosshair4.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[3]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - if (splitscreen > 2) - { -#ifdef HWRENDER - if (rendermode != render_soft) - { - x += (INT32)gr_viewwidth; - y += (INT32)gr_viewheight; - } - else -#endif - { - x += viewwidth; - y += viewheight; - } - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } -}*/ - static void HU_DrawCEcho(void) { INT32 i = 0;