From 59f09d48936b45fe539389300eddc3b372c63895 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 18 Dec 2019 15:40:39 +0200 Subject: [PATCH] - move setting status bar defaults to proper location BaseStatusBar.Init() method isn't suitable for this because it will override SBarInfoWrapper setup done in native code https://forum.zdoom.org/viewtopic.php?t=66676 https://forum.zdoom.org/viewtopic.php?t=66339 --- src/g_statusbar/shared_sbar.cpp | 1 + wadsrc/static/zscript/ui/statusbar/statusbar.zs | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index a86253b12a..31e3e451d7 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/src/g_statusbar/shared_sbar.cpp @@ -345,6 +345,7 @@ DBaseStatusBar::DBaseStatusBar () CPlayer = NULL; ShowLog = false; defaultScale = { (double)CleanXfac, (double)CleanYfac }; + SetSize(0); CreateAltHUD(); } diff --git a/wadsrc/static/zscript/ui/statusbar/statusbar.zs b/wadsrc/static/zscript/ui/statusbar/statusbar.zs index 85cf54475b..131649a2fe 100644 --- a/wadsrc/static/zscript/ui/statusbar/statusbar.zs +++ b/wadsrc/static/zscript/ui/statusbar/statusbar.zs @@ -320,7 +320,6 @@ class BaseStatusBar native ui virtual void Init() { - SetSize(0, 320, 200); } native virtual void Tick ();