From 5168ce0e04f1cb2f80aecce4c6dcc2fa4914dfbc Mon Sep 17 00:00:00 2001 From: DyNaM1Kk Date: Sat, 26 Apr 2025 23:45:14 +0400 Subject: [PATCH] Exported DrawCrosshair --- src/g_statusbar/shared_sbar.cpp | 13 +++++++++++++ wadsrc/static/zscript/ui/statusbar/statusbar.zs | 1 + 2 files changed, 14 insertions(+) diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index 5c4fa25d9..0626009b1 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/src/g_statusbar/shared_sbar.cpp @@ -1019,6 +1019,19 @@ void DBaseStatusBar::DrawCrosshair (double ticFrac) ST_DrawCrosshair(health, viewwidth / 2 + viewwindowx, viewheight / 2 + viewwindowy, size); } +static void DrawCrosshair(DBaseStatusBar* self, double ticFrac) +{ + self->DrawCrosshair(ticFrac); +} + +DEFINE_ACTION_FUNCTION_NATIVE(DBaseStatusBar, DrawCrosshair, DrawCrosshair) +{ + PARAM_SELF_PROLOGUE(DBaseStatusBar); + PARAM_FLOAT(ticFrac); + self->DrawCrosshair(ticFrac); + return 0; +} + //--------------------------------------------------------------------------- // // FlashCrosshair diff --git a/wadsrc/static/zscript/ui/statusbar/statusbar.zs b/wadsrc/static/zscript/ui/statusbar/statusbar.zs index 1cbaeae87..f0b502ba6 100644 --- a/wadsrc/static/zscript/ui/statusbar/statusbar.zs +++ b/wadsrc/static/zscript/ui/statusbar/statusbar.zs @@ -238,6 +238,7 @@ class BaseStatusBar : StatusBarCore native // [MK] let the HUD handle drawing the pause graphics virtual bool DrawPaused(int player) { return false; } + protected native void DrawCrosshair(double TicFrac); native TextureID GetMugshot(int accuracy, int stateflags=MugShot.STANDARD, String default_face = "STF"); native int GetTopOfStatusBar();