From bd1c37960fc420e26887494af356d592cae1a1aa Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 3 Jun 2021 19:57:14 +0200 Subject: [PATCH] - display the status bar. It's totally broken, but at least a start. --- source/games/whaven/src/drawweapon.cpp | 12 +++++++++++- wadsrc/static/zscript/games/wh/ui/sbar.zs | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/games/whaven/src/drawweapon.cpp b/source/games/whaven/src/drawweapon.cpp index 4ead978e0..35606f365 100644 --- a/source/games/whaven/src/drawweapon.cpp +++ b/source/games/whaven/src/drawweapon.cpp @@ -3,6 +3,8 @@ #include "v_font.h" #include "v_draw.h" #include "gamehud.h" +#include "statusbar.h" +#include "mapinfo.h" BEGIN_WH_NS @@ -428,7 +430,15 @@ void DrawHud(double const dasmoothratio) { if (scarytime >= 0) drawscary(); - //drawInterface(player[pyrn]); + SummaryInfo info{}; + info.kills = kills; + info.maxkills = killcnt; + info.secrets = treasuresfound; + info.maxsecrets = treasurescnt; + info.supersecrets = 0; + info.time = Scale(PlayClock, 1000, 120); + + UpdateStatusBar(&info); } END_WH_NS diff --git a/wadsrc/static/zscript/games/wh/ui/sbar.zs b/wadsrc/static/zscript/games/wh/ui/sbar.zs index 2b19df1e6..ef7423103 100644 --- a/wadsrc/static/zscript/games/wh/ui/sbar.zs +++ b/wadsrc/static/zscript/games/wh/ui/sbar.zs @@ -425,7 +425,7 @@ class WHStatusBar : RazeStatusBar } int amposx = 10; - int amposy = 40;//Raze.GetMessageBottomY(); + int amposy = Raze.GetMessageBottomY(); if(plr.treasure[Witchaven.TONYXRING] != 0) {