qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-15 01:11:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/client/sbar.c

2906 lines
75 KiB
C
Raw Normal View History

initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
/*
sbar.c
Status bar
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
#include <time.h>
move the api headers into include/QF and clean up (most of) the resulting mess. target specific files that I don't build won't compile yet. just put QF/ infront of the offending headers. Also move ver_check into libqfutils
2001-03-27 20:33:07 +00:00
#include "QF/cmd.h"
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
#include "QF/console.h"
no header includes cvar.h now
2001-05-31 03:41:35 +00:00
#include "QF/cvar.h"
Merge draw.h.
2001-05-09 22:40:51 +00:00
#include "QF/draw.h"
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
#include "QF/dstring.h"
#include "QF/gib.h"
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
#include "QF/info.h"
#include "QF/quakefs.h"
First pass at updating nq particles. Compiles. Crashes. Taniwha wanted a look. Flee in terror. Also has bunches of cleanups, including string.h/strings.h ifdefs, whitespace, and removal of pointless comments.
2001-05-09 05:41:34 +00:00
#include "QF/screen.h"
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
#include "QF/sys.h"
move the api headers into include/QF and clean up (most of) the resulting mess. target specific files that I don't build won't compile yet. just put QF/ infront of the offending headers. Also move ver_check into libqfutils
2001-03-27 20:33:07 +00:00
#include "QF/va.h"
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
#include "QF/vid.h"
FBDEV GLX SVGAlib X11 all build, but nq-glx doesn't link yet due to some changes between nq and qw (gl_mtexable, texture_mode and GL_CheckBrightness)
2001-04-15 21:11:41 +00:00
#include "QF/wad.h"
First pass at updating nq particles. Compiles. Crashes. Taniwha wanted a look. Flee in terror. Also has bunches of cleanups, including string.h/strings.h ifdefs, whitespace, and removal of pointless comments.
2001-05-09 05:41:34 +00:00
Don't include the specific plugin headers in plugin.h. This lets files that use plugins not depend on plugins they don't use.
2012-02-13 12:58:34 +00:00
#include "QF/plugin/console.h"
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
#include "QF/plugin/vid_render.h"
Don't include the specific plugin headers in plugin.h. This lets files that use plugins not depend on plugins they don't use.
2012-02-13 12:58:34 +00:00
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
#include "QF/ui/passage.h"
[ui] Create library for UI support code Currently this has text buffer, input line, vrect and view code.
2021-06-12 13:50:51 +00:00
#include "QF/ui/view.h"
fix the missing keys. Caused by a miss-understanding of the logic/resoning involved in the test.
2001-06-25 04:08:55 +00:00
#include "compat.h"
#include "sbar.h"
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
[client] Merge nq and qw cl_view They've been near-identical for years, now they're only one. It proved necessary to start merging the HUD code which for now is just a few cvar declarations (not even init), but that should be a separate set of commits.
2022-02-28 03:12:51 +00:00
#include "client/hud.h"
[client] Merge cl_screen.c The client state that was accessed by cl_screen is now put in viewstate and maintained by the client before calling CL_UpdateScreen.
2022-11-02 06:08:09 +00:00
#include "client/screen.h"
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
#include "client/state.h"
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
#include "client/world.h"
[client] Merge nq and qw cl_view They've been near-identical for years, now they're only one. It proved necessary to start merging the HUD code which for now is just a few cvar declarations (not even init), but that should be a separate set of commits.
2022-02-28 03:12:51 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
#include "gamedefs.h"
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
diff noise reduction.
2001-05-14 19:46:16 +00:00
int sb_updates; // if >= vid.numpages, no update needed
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static int sb_update_flags;
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
static int sb_view_size;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
static int fps_count;
static const char *sbar_levelname;
static const char *sbar_servername;
static player_info_t *sbar_players;
static int *sbar_stats;
static float *sbar_item_gettime;
static double sbar_time;
static double sbar_completed_time;
static double sbar_faceanimtime;
static int sbar_maxplayers;
static int sbar_playernum;
static int sbar_viewplayer;
static int sbar_spectator;
static int sbar_teamplay;
static int sbar_active;
static int sbar_intermission;
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
static view_t intermission_view;
static view_t intermission_time;
static view_t intermission_secr;
static view_t intermission_kill;
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
// view_t hud_view;
static view_t hud_miniteam;
static view_t sbar_main;
static view_t hud_minifrags; // child of sbar_main for positioning
static view_t sbar_inventory;
static view_t sbar_frags;
static view_t sbar_sigils;
static view_t sbar_items;
static view_t sbar_armament;
static view_t sbar_weapons;
static view_t sbar_miniammo;
static view_t sbar_statusbar;
static view_t sbar_armor;
static view_t sbar_face;
static view_t sbar_health;
static view_t sbar_ammo;
static view_t sbar_solo;
static view_t sbar_solo_monsters;
static view_t sbar_solo_secrets;
static view_t sbar_solo_time;
static view_t sbar_solo_anchor;
static view_t sbar_solo_name;
static view_t sbar_tile[2];
static view_t sbar_tile[2];
static view_t dmo_view;
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
typedef struct view_def_s {
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
view_t *view;
struct {
int x;
int y;
int w;
int h;
} rect;
grav_t gravity;
view_t *parent;
int count;
int xstep;
int ystep;
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
struct view_def_s *subviews;
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
} view_def_t;
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
// used for "current view"
static view_t pseudo_parent = nullview;
static view_def_t frags_defs[] = {
{0, {4, 1, 28, 4}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, {4, 5, 28, 3}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, {6, 0, 24, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, {0, 0, 34, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{}
};
static view_def_t minifrags_defs[] = {
{0, { 2, 1, 37, 3}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, { 2, 4, 37, 4}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, { 8, 0, 24, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, { 0, 0, 40, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
// teamplay team, name
{0, {48, 0, 32, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, {88, 0,104, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
// name
{0, {48, 0,128, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{}
};
static view_def_t miniteam_defs[] = {
{0, { 0, 0, 32, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, {40, 0, 40, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{0, {-8, 0, 48, 8}, grav_northwest, &pseudo_parent, 1, 0, 0},
{}
};
static view_def_t sbar_defs[] = {
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
{&hud_overlay_view, { 0, 0,320,200}, grav_center, &cl_screen_view},
{&intermission_view, { 0, 0,320,200}, grav_northwest, &hud_overlay_view},
{0, {64, 24, 24, 24}, grav_northwest, &intermission_view, 1, 0, 0},
{0, {0, 56, 24, 24}, grav_northwest, &intermission_view, 1, 0, 0},
{&intermission_time, {160,64,134,24}, grav_northwest, &intermission_view},
{0, {0, 0, 24, 24}, grav_northwest, &intermission_time, 3, 24, 0},
{0, {74, 0, 16, 24}, grav_northwest, &intermission_time, 1, 0, 0},
{0, {86, 0, 24, 24}, grav_northwest, &intermission_time, 2, 24, 0},
{&intermission_secr, {160,104,152,24}, grav_northwest, &intermission_view},
{0, {0, 0, 24, 24}, grav_northwest, &intermission_secr, 3, 24, 0},
{0, {72, 0, 16, 24}, grav_northwest, &intermission_secr, 1, 0, 0},
{0, {80, 0, 24, 24}, grav_northwest, &intermission_secr, 3, 24, 0},
{&intermission_kill, {160,144,152,24}, grav_northwest, &intermission_view},
{0, {0, 0, 24, 24}, grav_northwest, &intermission_kill, 3, 24, 0},
{0, {72, 0, 16, 24}, grav_northwest, &intermission_kill, 1, 0, 0},
{0, {80, 0, 24, 24}, grav_northwest, &intermission_kill, 3, 24, 0},
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
{&hud_view, { 0, 0,320, 48}, grav_south, &cl_screen_view},
{&hud_miniteam, { 0, 0, 96, 48}, grav_southeast, &hud_view},
{0, {0,0,96,8}, grav_northwest, &hud_miniteam, 6, 0, 8, miniteam_defs},
{&sbar_main, { 0, 0,320, 48}, grav_south, &hud_view},
{&hud_minifrags, {-192, 0,192, 48}, grav_southeast, &sbar_main},
{0, {0,0,192,8}, grav_northwest, &hud_minifrags, 6, 0, 8, minifrags_defs},
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
{&sbar_inventory, { 0, 0,320, 24}, grav_northwest, &sbar_main},
{&sbar_frags, { 0, 0,130, 8}, grav_northeast, &sbar_inventory},
{&sbar_sigils, { 0, 0, 32, 16}, grav_southeast, &sbar_inventory},
{&sbar_items, { 32, 0, 96, 16}, grav_southeast, &sbar_inventory},
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
//NOTE sbar_armament moves and gets layed out again on hud_sbar change
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
{&sbar_armament, { 0, 0,202, 24}, grav_northwest, &sbar_inventory},
{&sbar_weapons, { 0, 0,192, 16}, grav_southwest, &sbar_armament},
{&sbar_miniammo, { 0, 0, 32, 8}, grav_northwest, &sbar_armament},
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
{&sbar_statusbar, { 0, 0,320, 24}, grav_southwest, &sbar_main},
{&sbar_armor, { 0, 0, 96, 24}, grav_northwest, &sbar_statusbar},
{&sbar_face, {112, 0, 24, 24}, grav_northwest, &sbar_statusbar},
{&sbar_health, {136, 0, 72, 24}, grav_northwest, &sbar_statusbar},
{&sbar_ammo, {224, 0, 96, 24}, grav_northwest, &sbar_statusbar},
{&sbar_tile[0], { 0, 0, 0, 48}, grav_southwest, &sbar_main},
{&sbar_tile[1], { 0, 0, 0, 48}, grav_southeast, &sbar_main},
{&sbar_solo, { 0, 0,320, 24}, grav_southwest, &sbar_main},
{&sbar_solo_monsters, { 8, 4,136, 8}, grav_northwest, &sbar_solo},
{&sbar_solo_secrets, { 8,12,136, 8}, grav_northwest, &sbar_solo},
{&sbar_solo_time, {184, 4, 96, 8}, grav_northwest, &sbar_solo},
{&sbar_solo_anchor, {232,12, 0, 8}, grav_northwest, &sbar_solo},
{&sbar_solo_name, { 0, 0, 0, 8}, grav_center, &sbar_solo_anchor},
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
{0, { 0, 0, 32, 8}, grav_northwest, &sbar_frags, 4, 32, 0, frags_defs},
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
{0, { 0, 0, 8, 16}, grav_northwest, &sbar_sigils, 4, 8, 0},
{0, { 0, 0, 24, 24}, grav_northwest, &sbar_armor, 4, 24, 0},
{0, { 0, 0, 24, 24}, grav_northwest, &sbar_ammo, 4, 24, 0},
{0, { 0, 0, 16, 16}, grav_northwest, &sbar_items, 6, 16, 0},
{0, { 0, 0, 24, 16}, grav_northwest, &sbar_weapons, 7, 24, 0},
[nq] Correct the number of children for the health view It needs only 3 as the face has its own view.
2022-11-06 11:11:45 +00:00
{0, { 0, 0, 24, 24}, grav_northwest, &sbar_health, 3, 24, 0},
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
{0, {10, 0, 24, 8}, grav_northwest, &sbar_miniammo, 4, 48, 0},
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
{&dmo_view, { 0, 0,320, 200}, grav_center, &cl_screen_view},
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
{}
};
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
static draw_charbuffer_t *time_buff;
static draw_charbuffer_t *fps_buff;
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static draw_charbuffer_t *solo_monsters;
static draw_charbuffer_t *solo_secrets;
static draw_charbuffer_t *solo_time;
static draw_charbuffer_t *solo_name;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static view_t
sbar_view (int x, int y, int w, int h, grav_t gravity, view_t parent)
{
view_t view = View_New (hud_registry, parent);
View_SetPos (view, x, y);
View_SetLen (view, w, h);
View_SetGravity (view, gravity);
View_SetVisible (view, 1);
return view;
}
static inline void
[nq] Clean up sbar updates for info changes Most of the update functions are scheduled by Sbar_Changed() using tables to determine what update functions need to be called for which view entities. As hud_updateonce is called, and an entity can have only one of any component, this becomes a set of updates to call when during hud/sbar rendering.
2022-11-04 02:31:11 +00:00
sbar_setcomponent (view_t view, uint32_t comp, const void *data)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
{
Ent_SetComponent (view.id, comp, view.reg, data);
}
static inline int
sbar_hascomponent (view_t view, uint32_t comp)
{
return Ent_HasComponent (view.id, comp, view.reg);
}
static inline void *
sbar_getcomponent (view_t view, uint32_t comp)
{
return Ent_GetComponent (view.id, comp, view.reg);
}
static inline void
sbar_remcomponent (view_t view, uint32_t comp)
{
Ent_RemoveComponent (view.id, comp, view.reg);
}
diff noise reduction.
2001-05-14 19:46:16 +00:00
#define STAT_MINUS 10 // num frame for '-' stats digit
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qpic_t *sb_nums[2][11];
static qpic_t *sb_colon, *sb_slash;
static qpic_t *sb_ibar;
static qpic_t *sb_sbar;
static qpic_t *sb_scorebar;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
// 0 is active, 1 is owned, 2-6 are flashes
static hud_subpic_t sb_weapons[7][8];
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qpic_t *sb_ammo[4];
static qpic_t *sb_sigil[4];
static qpic_t *sb_armor[3];
static qpic_t *sb_items[32];
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qpic_t *sb_faces[7][2]; // 0 is gibbed, 1 is dead, 2-6 are alive
diff noise reduction.
2001-05-14 19:46:16 +00:00
// 0 is static, 1 is temporary animation
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qpic_t *sb_face_invis;
static qpic_t *sb_face_quad;
static qpic_t *sb_face_invuln;
static qpic_t *sb_face_invis_invuln;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qboolean sb_showscores;
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
static qboolean sb_showteamscores;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static int sb_lines; // scan lines to draw
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qpic_t *rsb_invbar[2];
static qpic_t *rsb_weapons[5];
static qpic_t *rsb_items[2];
static qpic_t *rsb_ammo[3];
static qpic_t *rsb_teambord; // PGM 01/19/97 - team color border
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
// MED 01/04/97 added two more weapons + 3
// alternates for grenade launcher
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static qpic_t *hsb_weapons[7][5]; // 0 is active, 1 is owned, 2-5 are flashes
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
run indent over all the .c files using qw's .indent.pro. The real reason for this is I mistakenly did so while making some other changes (which I made sure were NOT in the checkin:)
2001-02-26 06:48:02 +00:00
// MED 01/04/97 added array to simplify
// weapon parsing
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
//static int hipweapons[4] =
// { HIT_LASER_CANNON_BIT, HIT_MJOLNIR_BIT, 4, HIT_PROXIMITY_GUN_BIT };
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
qpic_t *hsb_items[2]; // MED 01/04/97 added hipnotic items array
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
//static qboolean largegame = false;
char *fs_fraglog;
static cvar_t fs_fraglog_cvar = {
.name = "fs_fraglog",
.description =
"Filename of the automatic frag-log.",
.default_value = "qw-scores.log",
.flags = CVAR_ARCHIVE,
.value = { .type = 0, .value = &fs_fraglog },
};
int cl_fraglog;
static cvar_t cl_fraglog_cvar = {
.name = "cl_fraglog",
.description =
"Automatic fraglogging, non-zero value will switch it on.",
.default_value = "0",
.flags = CVAR_ARCHIVE,
.value = { .type = &cexpr_int, .value = &cl_fraglog },
};
int hud_scoreboard_uid;
static cvar_t hud_scoreboard_uid_cvar = {
.name = "hud_scoreboard_uid",
.description =
"Set to 1 to show uid instead of ping. Set to 2 to show both.",
.default_value = "0",
.flags = CVAR_NONE,
.value = { .type = &cexpr_int, .value = &hud_scoreboard_uid },
};
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
float scr_centertime;
static cvar_t scr_centertime_cvar = {
.name = "scr_centertime",
.description =
"How long in seconds screen hints are displayed",
.default_value = "2",
.flags = CVAR_NONE,
.value = { .type = &cexpr_float, .value = &scr_centertime },
};
float scr_printspeed;
static cvar_t scr_printspeed_cvar = {
.name = "scr_printspeed",
.description =
"How fast the text is displayed at the end of the single player "
"episodes",
.default_value = "8",
.flags = CVAR_NONE,
.value = { .type = &cexpr_float, .value = &scr_printspeed },
};
re-arrange viewsize handling to fix the hud bug in glx
2003-02-11 21:24:27 +00:00
static void
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
viewsize_f (int view_size)
re-arrange viewsize handling to fix the hud bug in glx
2003-02-11 21:24:27 +00:00
{
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
sb_view_size = view_size;
HUD_Calc_sb_lines (view_size);
[renderer] Clean up a lot of recalc_refdef use I think the widespread use of recalc_refdef (and force_fullscreen) was the result of a rushed merge of the renderer and video code (I do seem to remember sprinkling them around). This cleans the two out of the client code.
2022-03-18 15:56:30 +00:00
if (hud_sbar) {
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
SCR_SetBottomMargin (hud_sbar ? sb_lines : 0);
[renderer] Clean up a lot of recalc_refdef use I think the widespread use of recalc_refdef (and force_fullscreen) was the result of a rushed merge of the renderer and video code (I do seem to remember sprinkling them around). This cleans the two out of the client code.
2022-03-18 15:56:30 +00:00
}
re-arrange viewsize handling to fix the hud bug in glx
2003-02-11 21:24:27 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static int __attribute__((used))
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
Sbar_ColorForMap (int m)
{
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
return (bound (0, m, 13) * 16) + 8;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
get qf compiling with gcc 4.4
2009-12-19 10:54:23 +00:00
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_num (view_t *view, int num, int digits, int color)
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
{
fix a bunch of the previous FIXMEs. needs a bit more work for win32 compiling
2003-07-08 22:39:45 +00:00
char str[12];
run indent over all the .c files using qw's .indent.pro. The real reason for this is I mistakenly did so while making some other changes (which I made sure were NOT in the checkin:)
2001-02-26 06:48:02 +00:00
char *ptr;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
int l, frame, x = 0;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
fix a bunch of the previous FIXMEs. needs a bit more work for win32 compiling
2003-07-08 22:39:45 +00:00
if (num > 999999999)
num = 999999999;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
l = snprintf (str, sizeof (str), "%d", num);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
ptr = str;
if (l > digits)
run indent over all the .c files using qw's .indent.pro. The real reason for this is I mistakenly did so while making some other changes (which I made sure were NOT in the checkin:)
2001-02-26 06:48:02 +00:00
ptr += (l - digits);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
while (digits > l) {
sbar_remcomponent (view[x++], hud_pic);
digits--;
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
while (*ptr) {
if (*ptr == '-')
frame = STAT_MINUS;
else
run indent over all the .c files using qw's .indent.pro. The real reason for this is I mistakenly did so while making some other changes (which I made sure were NOT in the checkin:)
2001-02-26 06:48:02 +00:00
frame = *ptr - '0';
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
sbar_setcomponent (view[x++], hud_pic, &sb_nums[color][frame]);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
ptr++;
}
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static inline void
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
draw_smallnum (view_t view, int n, int packed, int colored)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
void *comp = sbar_getcomponent (view, hud_charbuff);
__auto_type charbuff = *(draw_charbuffer_t **) comp;
char num[4];
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
packed = packed != 0; // ensure 0 or 1
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
n = bound (-99, n, 999);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
snprintf (num, sizeof (num), "%3d", n);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 3; i++) {
charbuff->chars[i] = num[i] - (colored && num[i] != ' ' ? '0' - 18 : 0);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_miniammo (view_t view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
int i, count;
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
// ammo counts
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
for (i = 0; i < 4; i++) {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
view_t v = View_GetChild (view, i);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
count = sbar_stats[STAT_SHELLS + i];
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
draw_smallnum (v, count, 0, 1);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_ammo (view_t view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
qpic_t *pic = 0;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & IT_SHELLS)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
pic = sb_ammo[0];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & IT_NAILS)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
pic = sb_ammo[1];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & IT_ROCKETS)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
pic = sb_ammo[2];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & IT_CELLS)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
pic = sb_ammo[3];
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
view_t ammo = View_GetChild (view, 0);
if (pic) {
sbar_setcomponent (ammo, hud_pic, &pic);
} else {
sbar_remcomponent (ammo, hud_pic);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
view_t num[3] = {
View_GetChild (view, 1),
View_GetChild (view, 2),
View_GetChild (view, 3),
};
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (num, sbar_stats[STAT_AMMO], 3, sbar_stats[STAT_AMMO] <= 10);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
Merge draw.h.
2001-05-09 22:40:51 +00:00
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static int
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
calc_flashon (float time, int mask)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
int flashon;
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
flashon = (int) ((sbar_time - time) * 10);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
if (flashon < 0)
flashon = 0;
if (flashon >= 10) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ACTIVEWEAPON] == mask)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
flashon = 1;
else
flashon = 0;
} else
flashon = (flashon % 5) + 2;
return flashon;
}
static void
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
draw_weapons (view_t view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
int flashon, i;
for (i = 0; i < 7; i++) {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
view_t weap = View_GetChild (view, i);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (IT_SHOTGUN << i)) {
flashon = calc_flashon (sbar_item_gettime[i], IT_SHOTGUN << i);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
if (flashon > 1)
sb_updates = 0; // force update to remove flash
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sbar_setcomponent (weap, hud_subpic, &sb_weapons[flashon][i]);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
} else {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sbar_remcomponent (weap, hud_subpic);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
}
}
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_items (view_t view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
//float time;
//int flashon = 0, i;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 6; i++) {
view_t item = View_GetChild (view, i);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (1 << (17 + i))) {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
time = sbar_item_gettime[17 + i];
if (time && time > sbar_time - 2 && flashon) { // Flash frame
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
sb_updates = 0;
} else {
draw_pic (view, i * 16, 0, sb_items[i]);
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (time && time > sbar_time - 2)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
sb_updates = 0;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
sbar_setcomponent (item, hud_pic, &sb_items[i]);
} else {
sbar_remcomponent (item, hud_pic);
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
}
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_sigils (view_t view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
//float time;
//int flashon = 0, i;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 4; i++) {
view_t sigil = View_GetChild (view, i);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (1 << (28 + i))) {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
time = sbar_item_gettime[28 + i];
if (time && time > sbar_time - 2 && flashon) { // flash frame
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
sb_updates = 0;
} else {
draw_pic (view, i * 8, 0, sb_sigil[i]);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (time && time > sbar_time - 2)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
sb_updates = 0;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
sbar_setcomponent (sigil, hud_pic, &sb_sigil[i]);
} else {
sbar_remcomponent (sigil, hud_pic);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
typedef struct {
char team[16 + 1];
int frags;
int players;
int plow, phigh, ptotal;
} team_t;
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
team_t teams[MAX_PLAYERS];
int teamsort[MAX_PLAYERS];
int fragsort[MAX_PLAYERS];
static view_t sb_views[MAX_PLAYERS];
static draw_charbuffer_t *sb_fph[MAX_PLAYERS];
static draw_charbuffer_t *sb_time[MAX_PLAYERS];
static draw_charbuffer_t *sb_frags[MAX_PLAYERS];
static draw_charbuffer_t *sb_team[MAX_PLAYERS];
static draw_charbuffer_t *sb_ping[MAX_PLAYERS];
static draw_charbuffer_t *sb_pl[MAX_PLAYERS];
static draw_charbuffer_t *sb_uid[MAX_PLAYERS];
static draw_charbuffer_t *sb_name[MAX_PLAYERS];
static draw_charbuffer_t *sb_team_frags[MAX_PLAYERS];
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
static draw_charbuffer_t *sb_spectator;
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
int scoreboardlines, scoreboardteams;
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
static void
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
Sbar_SortFrags (qboolean includespec)
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
{
int i, j, k;
// sort by frags
scoreboardlines = 0;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
for (i = 0; i < sbar_maxplayers; i++) {
if (sbar_players[i].name && sbar_players[i].name->value[0]
&& (!sbar_players[i].spectator || includespec)) {
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
fragsort[scoreboardlines] = i;
scoreboardlines++;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_players[i].spectator)
sbar_players[i].frags = -999;
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
}
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
for (i = scoreboardlines; i < sbar_maxplayers; i++) {
[nq] Set unused fragsort entries to -1 The first scoreboard entry not showing was due to it being deleted immediately because unused fragsort array entries had a valid player index (0 in this case) and thus the unused view removal code was removing views it should not.
2022-11-08 03:49:41 +00:00
fragsort[i] = -1;
}
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
player_info_t *p = sbar_players;
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
for (i = 0; i < scoreboardlines; i++) {
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
for (j = 0; j < scoreboardlines - 1 - i; j++) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
if (p[fragsort[j]].frags < p[fragsort[j + 1]].frags) {
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
k = fragsort[j];
fragsort[j] = fragsort[j + 1];
fragsort[j + 1] = k;
}
}
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
Sbar_SortTeams (void)
{
char t[16 + 1];
int i, j, k;
player_info_t *s;
// request new ping times every two second
scoreboardteams = 0;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (!sbar_teamplay)
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
return;
// sort the teams
memset (teams, 0, sizeof (teams));
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
for (i = 0; i < MAX_PLAYERS; i++)
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
teams[i].plow = 999;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
for (i = 0; i < MAX_PLAYERS; i++) {
s = &sbar_players[i];
[nq,qw] Do a little more diff reduction on sbar.c It's rather difficult due to hipnotic and roque in nq, but still, progress is progress.
2022-05-04 12:03:34 +00:00
if (!s->name || !s->name->value[0])
continue;
if (s->spectator)
continue;
// find his team in the list
t[16] = 0;
strncpy (t, s->team->value, 16);
if (!t[0])
continue; // not on team
for (j = 0; j < scoreboardteams; j++)
if (!strcmp (teams[j].team, t)) {
teams[j].frags += s->frags;
teams[j].players++;
goto addpinginfo;
}
if (j == scoreboardteams) { // must add him
j = scoreboardteams++;
strcpy (teams[j].team, t);
teams[j].frags = s->frags;
teams[j].players = 1;
addpinginfo:
if (teams[j].plow > s->ping)
teams[j].plow = s->ping;
if (teams[j].phigh < s->ping)
teams[j].phigh = s->ping;
teams[j].ptotal += s->ping;
}
}
// sort
for (i = 0; i < scoreboardteams; i++)
teamsort[i] = i;
// good 'ol bubble sort
for (i = 0; i < scoreboardteams - 1; i++) {
for (j = i + 1; j < scoreboardteams; j++) {
if (teams[teamsort[i]].frags < teams[teamsort[j]].frags) {
k = teamsort[i];
teamsort[i] = teamsort[j];
teamsort[j] = k;
}
}
}
}
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static int
write_charbuff (draw_charbuffer_t *buffer, int x, int y, const char *str)
{
char *dst = buffer->chars;
int count = buffer->width - x;
int chars = 0;
dst += y * buffer->width + x;
while (*str && count-- > 0) {
*dst++ = *str++;
chars++;
}
while (count-- > 0) {
*dst++ = ' ';
}
return chars;
}
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static void
draw_solo_time (void)
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
int minutes = sbar_time / 60;
int seconds = sbar_time - 60 * minutes;
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
write_charbuff (solo_time, 0, 0,
va (0, "Time :%3i:%02i", minutes, seconds));
}
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static void
draw_solo (void)
{
write_charbuff (solo_monsters, 0, 0,
va (0, "Monsters:%3i /%3i",
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
sbar_stats[STAT_MONSTERS], sbar_stats[STAT_TOTALMONSTERS]));
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
write_charbuff (solo_secrets, 0, 0,
va (0, "Secrets :%3i /%3i",
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
sbar_stats[STAT_SECRETS], sbar_stats[STAT_TOTALSECRETS]));
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
draw_solo_time ();
view_pos_t len = View_GetLen (sbar_solo_name);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
len.x = 8 * write_charbuff (solo_name, 0, 0, sbar_levelname);
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
View_SetLen (sbar_solo_name, len.x, len.y);
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
}
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
static void
clear_frags_bar (view_t view)
{
sbar_remcomponent (View_GetChild (view, 0), hud_fill);
sbar_remcomponent (View_GetChild (view, 1), hud_fill);
sbar_remcomponent (View_GetChild (view, 2), hud_charbuff);
sbar_remcomponent (View_GetChild (view, 3), hud_func);
}
static void
clear_minifrags_bar (view_t view)
{
clear_frags_bar (view);
sbar_remcomponent (View_GetChild (view, 4), hud_charbuff);
sbar_remcomponent (View_GetChild (view, 5), hud_charbuff);
sbar_remcomponent (View_GetChild (view, 6), hud_charbuff);
}
static void
set_frags_bar (view_t view, byte top, byte bottom, draw_charbuffer_t *buff,
hud_func_f func)
{
sbar_setcomponent (View_GetChild (view, 0), hud_fill, &top);
sbar_setcomponent (View_GetChild (view, 1), hud_fill, &bottom);
sbar_setcomponent (View_GetChild (view, 2), hud_charbuff, &buff);
if (func) {
sbar_setcomponent (View_GetChild (view, 3), hud_func, &func);
} else {
sbar_remcomponent (View_GetChild (view, 3), hud_func);
}
}
static void
set_minifrags_bar (view_t view, byte top, byte bottom, draw_charbuffer_t *buff,
hud_func_f func, draw_charbuffer_t *team,
draw_charbuffer_t *name)
{
set_frags_bar (view, top, bottom, buff, func);
if (team) {
sbar_setcomponent (View_GetChild (view, 4), hud_charbuff, &team);
sbar_setcomponent (View_GetChild (view, 5), hud_charbuff, &name);
sbar_remcomponent (View_GetChild (view, 6), hud_charbuff);
} else {
sbar_remcomponent (View_GetChild (view, 4), hud_charbuff);
sbar_remcomponent (View_GetChild (view, 5), hud_charbuff);
sbar_setcomponent (View_GetChild (view, 6), hud_charbuff, &name);
}
}
static void
frags_marker (view_pos_t pos, view_pos_t len)
{
r_funcs->Draw_Character (pos.x, pos.y, 16);
r_funcs->Draw_Character (pos.x + len.x - 8, pos.y, 17);
}
make gcc more anal about prototypes, string constants and function visibility (ie, global functions must have a prototype)
2003-01-06 18:28:13 +00:00
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_frags (view_t view)
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_maxplayers == 1) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
return;
}
Sbar_SortFrags (0);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
int numbars = 4;
int count = min (scoreboardlines, numbars);
int i;
for (i = 0; i < count; i++) {
int k = fragsort[i];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
__auto_type s = &sbar_players[k];
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
view_t bar = View_GetChild (view, i);
set_frags_bar (bar,
Sbar_ColorForMap (s->topcolor),
Sbar_ColorForMap (s->bottomcolor),
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
sb_frags[k],
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
(k == sbar_viewplayer) ? frags_marker : 0);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
draw_smallnum (View_GetChild (bar, 2), s->frags, 0, 0);
}
for (; i < numbars; i++) {
clear_frags_bar (View_GetChild (view, i));
}
}
static void
draw_minifrags (view_t view)
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_maxplayers == 1) {
auto-arange the hud if the screen is too small for hipnotic or rogue
2003-05-09 19:24:48 +00:00
return;
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
}
Sbar_SortFrags (0);
auto-arange the hud if the screen is too small for hipnotic or rogue
2003-05-09 19:24:48 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
// find us
view_pos_t len = View_GetLen (view);
int numbars = len.y / 8;
int start = 0;
int i;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
for (i = 0; i < scoreboardlines; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (fragsort[i] == sbar_playernum) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
start = min (i - numbars / 2, scoreboardlines - numbars);
start = max (0, start);
}
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
int count = min (scoreboardlines - start, numbars);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
for (i = 0; i < count; i++) {
int k = fragsort[i + start];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
__auto_type s = &sbar_players[k];
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
view_t bar = View_GetChild (view, i);
set_minifrags_bar (bar,
Sbar_ColorForMap (s->topcolor),
Sbar_ColorForMap (s->bottomcolor),
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
sb_frags[k],
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
(k == sbar_viewplayer) ? frags_marker : 0,
sbar_teamplay ? sb_team[k] : 0,
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
sb_name[k]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_teamplay) {
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
write_charbuff (sb_team[k], 0, 0, s->team->value);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
}
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
write_charbuff (sb_name[k], 0, 0, s->name->value);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
draw_smallnum (View_GetChild (bar, 2), s->frags, 0, 0);
}
for (; i < numbars; i++) {
clear_minifrags_bar (View_GetChild (view, i));
}
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
static void
clear_miniteam_bar (view_t view)
{
sbar_remcomponent (View_GetChild (view, 0), hud_charbuff);
sbar_remcomponent (View_GetChild (view, 1), hud_charbuff);
sbar_remcomponent (View_GetChild (view, 2), hud_func);
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
static void
set_miniteam_bar (view_t view, draw_charbuffer_t *team,
draw_charbuffer_t *frags, hud_func_f func)
{
sbar_setcomponent (View_GetChild (view, 0), hud_charbuff, &team);
sbar_setcomponent (View_GetChild (view, 1), hud_charbuff, &frags);
if (func) {
sbar_setcomponent (View_GetChild (view, 2), hud_func, &func);
} else {
sbar_remcomponent (View_GetChild (view, 2), hud_func);
}
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
static void
draw_miniteam (view_t view)
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (!sbar_teamplay) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
return;
}
Sbar_SortTeams ();
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
view_pos_t len = View_GetLen (view);
int numbars = len.y / 8;
int count = min (scoreboardteams, numbars);
int i;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
info_key_t *player_team = sbar_players[sbar_playernum].team;
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
for (i = 0; i < count; i++) {
int k = teamsort[i];
team_t *tm = teams + k;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
__auto_type s = &sbar_players[k];
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
view_t bar = View_GetChild (view, i);
hud_func_f func = 0;
if (player_team && strnequal (player_team->value, tm->team, 16)) {
func = frags_marker;
}
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
set_miniteam_bar (bar, sb_team[k], sb_team_frags[k], func);
write_charbuff (sb_team[k], 0, 0, s->team->value);
write_charbuff (sb_team_frags[k], 0, 0, va (0, "%5d", tm->frags));
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
for (; i < numbars; i++) {
clear_miniteam_bar (View_GetChild (view, i));
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
}
make gcc more anal about prototypes, string constants and function visibility (ie, global functions must have a prototype)
2003-01-06 18:28:13 +00:00
static void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_face (view_t view)
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
{
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
qpic_t *face;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_HEALTH] <= 0) {//FIXME hide_Face or hide_sbar
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
sbar_remcomponent (sbar_face, hud_pic);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
return;
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if ((sbar_stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY))
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
== (IT_INVISIBILITY | IT_INVULNERABILITY)) {
face = sb_face_invis_invuln;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
} else if (sbar_stats[STAT_ITEMS] & IT_QUAD) {
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
face = sb_face_quad;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
} else if (sbar_stats[STAT_ITEMS] & IT_INVISIBILITY) {
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
face = sb_face_invis;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
} else if (sbar_stats[STAT_ITEMS] & IT_INVULNERABILITY) {
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
face = sb_face_invuln;
} else {
int f, anim;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_HEALTH] >= 100) {
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
f = 4;
} else {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
f = sbar_stats[STAT_HEALTH] / 20;
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_time <= sbar_faceanimtime) {
[nq] Get face animations working again
2022-11-04 00:41:23 +00:00
anim = 1;
sb_updates = 0; // make sure the anim gets drawn over
} else {
anim = 0;
}
face = sb_faces[f][anim];
}
sbar_setcomponent (view, hud_pic, &face);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
static void __attribute__((used))
draw_spectator (view_t *view)
{
#if 0
char st[512];
if (autocam != CAM_TRACK) {
draw_string (view, 160 - 7 * 8, 4, "SPECTATOR MODE");
draw_string (view, 160 - 14 * 8 + 4, 12,
"Press [ATTACK] for AutoCamera");
} else {
// Sbar_DrawString (160-14*8+4,4, "SPECTATOR MODE - TRACK CAMERA");
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_players[spec_track].name) {
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
snprintf (st, sizeof (st), "Tracking %-.13s, [JUMP] for next",
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
sbar_players[spec_track].name->value);
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
} else {
snprintf (st, sizeof (st), "Lost player, [JUMP] for next");
}
draw_string (view, 0, -8, st);
}
#endif
}
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
static inline void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_armor (view_t view)
{
view_t armor = View_GetChild (view, 0);
view_t num[3] = {
View_GetChild (view, 1),
View_GetChild (view, 2),
View_GetChild (view, 3),
};
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & IT_INVULNERABILITY) {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_num (num, 666, 3, 1);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
} else {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (num, sbar_stats[STAT_ARMOR], 3, sbar_stats[STAT_ARMOR] <= 25);
if (sbar_stats[STAT_ITEMS] & IT_ARMOR3)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
sbar_setcomponent (armor, hud_pic, &sb_armor[2]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & IT_ARMOR2)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
sbar_setcomponent (armor, hud_pic, &sb_armor[1]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & IT_ARMOR1)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
sbar_setcomponent (armor, hud_pic, &sb_armor[0]);
else
sbar_remcomponent (armor, hud_pic);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
static inline void
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_health (view_t view)
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
view_t num[3] = {
View_GetChild (view, 0),
View_GetChild (view, 1),
View_GetChild (view, 2),
};
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (num, sbar_stats[STAT_HEALTH], 3, sbar_stats[STAT_HEALTH] <= 25);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
static void
draw_status (view_t *view)
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_spectator) {
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
draw_spectator (view);
if (autocam != CAM_TRACK)
return;
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sb_showscores || sbar_stats[STAT_HEALTH] <= 0) {
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_solo (view);
return;
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_armor (sbar_status_armor);
draw_face (sbar_status_face);
draw_health (sbar_status_health);
draw_ammo (sbar_status_ammo);
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_rogue_weapons_sbar (view_t *view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
int i;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_weapons_sbar (view);
// check for powered up weapon.
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN) {
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
for (i = 0; i < 5; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << i)) {
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_pic (view, (i + 2) * 24, 0, rsb_weapons[i]);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_rogue_weapons_hud (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
fix rogue's item code
2003-05-10 02:54:17 +00:00
int flashon, i, j;
qpic_t *pic;
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
for (i = cl_screen_view->ylen < 204; i < 7; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (IT_SHOTGUN << i)) {
flashon = calc_flashon (sbar_item_gettime[i], IT_SHOTGUN << i);
fix rogue's item code
2003-05-10 02:54:17 +00:00
if (i >= 2) {
j = i - 2;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << j))
fix rogue's item code
2003-05-10 02:54:17 +00:00
pic = rsb_weapons[j];
else
pic = sb_weapons[flashon][i];
} else {
pic = sb_weapons[flashon][i];
}
draw_subpic (view, 0, i * 16, pic, 0, 0, 24, 16);
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
if (flashon > 1)
sb_updates = 0; // force update to remove flash
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_rogue_ammo_hud (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
int i, count;
qpic_t *pic;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN)
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
pic = rsb_invbar[0];
else
pic = rsb_invbar[1];
for (i = 0; i < 4; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
count = sbar_stats[STAT_SHELLS + i];
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_subpic (view, 0, i * 11, pic, 3 + (i * 48), 0, 42, 11);
draw_smallnum (view, 7, i * 11, count, 0, 1);
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_rogue_items (view_t *view)
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
int i;
float time;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_items (view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
for (i = 0; i < 2; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (1 << (29 + i))) {
time = sbar_item_gettime[29 + i];
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_pic (view, 96 + i * 16, 0, rsb_items[i]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (time && time > (sbar_time - 2))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
sb_updates = 0;
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_rogue_inventory_sbar (view_t *view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN)
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_pic (view, 0, 0, rsb_invbar[0]);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
else
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_pic (view, 0, 0, rsb_invbar[1]);
view_draw (view);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_rogue_face (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
int top, bottom;
Move qw's player_info_t to client/state.h And use it instead of scoreboard_t in nq.
2013-01-31 08:18:29 +00:00
player_info_t *s;
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
// PGM 01/19/97 - team color drawing
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
s = &sbar_players[sbar_viewplayer];
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
Split nq's colors into topcolor/bottomcolor. The protocol is not affected: the incoming colors byte is split into the two fields when read from the packet. This simplifies a lot of code elsewhere.
2012-05-26 03:04:23 +00:00
top = Sbar_ColorForMap (s->topcolor);
bottom = Sbar_ColorForMap (s->bottomcolor);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_pic (view, 112, 0, rsb_teambord);
draw_fill (view, 113, 3, 22, 9, top);
draw_fill (view, 113, 12, 22, 9, bottom);
draw_smallnum (view, 108, 3, s->frags, 1, top == 8);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_rogue_status (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sb_showscores || sbar_stats[STAT_HEALTH] <= 0) {
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_solo (view);
return;
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (view, 24, 0, sbar_stats[STAT_ARMOR], 3,
sbar_stats[STAT_ARMOR] <= 25);
if (sbar_stats[STAT_ITEMS] & RIT_ARMOR3)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 0, 0, sb_armor[2]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_ARMOR2)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 0, 0, sb_armor[1]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_ARMOR1)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 0, 0, sb_armor[0]);
audit the usage of "only" There are still a few iffy places (notably around certain prepositions), but the relevant sentences are now much easier to read.
2010-01-13 06:42:26 +00:00
// PGM 03/02/97 - fixed so color swatch appears in only CTF modes
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_maxplayers != 1 && teamplay > 3 && teamplay < 7)
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_rogue_face (view);
else
draw_face (view);
fix rogue's item code
2003-05-10 02:54:17 +00:00
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_health (view);
fix rogue's item code
2003-05-10 02:54:17 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & RIT_SHELLS)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, sb_ammo[0]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_NAILS)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, sb_ammo[1]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_ROCKETS)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, sb_ammo[2]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_CELLS)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, sb_ammo[3]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_LAVA_NAILS)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, rsb_ammo[0]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_PLASMA_AMMO)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, rsb_ammo[1]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
else if (sbar_stats[STAT_ITEMS] & RIT_MULTI_ROCKETS)
fix rogue's item code
2003-05-10 02:54:17 +00:00
draw_pic (view, 224, 0, rsb_ammo[2]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (view, 248, 0, sbar_stats[STAT_AMMO], 3, sbar_stats[STAT_AMMO] <= 10);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_hipnotic_weapons_sbar (view_t *view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
static int x[] = {0, 24, 48, 72, 96, 120, 144, 176, 200, 96};
static int h[] = {0, 1, 3};
int flashon, i;
qpic_t *pic;
int mask;
float time;
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
for (i = 0; i < 10; i++) {
if (i < 7) {
mask = IT_SHOTGUN << i;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
time = sbar_item_gettime[i];
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
} else {
mask = 1 << hipweapons[h[i - 7]];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
time = sbar_item_gettime[hipweapons[h[i - 7]]];
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & mask) {
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
flashon = calc_flashon (time, mask);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (i == 4 && sbar_stats[STAT_ACTIVEWEAPON] == (1 << hipweapons[3]))
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
continue;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (i == 9 && sbar_stats[STAT_ACTIVEWEAPON] != (1 << hipweapons[3]))
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
continue;
if (i < 7) {
pic = sb_weapons[flashon][i];
} else {
pic = hsb_weapons[flashon][h[i - 7]];
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
clean up hipnotic weapons sbar code a bit
2003-05-11 05:20:41 +00:00
draw_subpic (view, x[i], 0, pic, 0, 0, 24, 16);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
if (flashon > 1)
sb_updates = 0; // force update to remove flash
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_hipnotic_weapons_hud (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
get the hipnotic hud working properly
2003-05-11 04:51:14 +00:00
int flashon, i;
static int y[] = {0, 16, 32, 48, 64, 96, 112, 128, 144, 80};
static int h[] = {0, 1, 3};
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
qpic_t *pic;
int mask;
float time;
get the hipnotic hud working properly
2003-05-11 04:51:14 +00:00
for (i = 0; i < 10; i++) {
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
if (i < 7) {
get the hipnotic hud working properly
2003-05-11 04:51:14 +00:00
mask = IT_SHOTGUN << i;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
time = sbar_item_gettime[i];
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
} else {
get the hipnotic hud working properly
2003-05-11 04:51:14 +00:00
mask = 1 << hipweapons[h[i - 7]];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
time = sbar_item_gettime[hipweapons[h[i - 7]]];
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & mask) {
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
flashon = calc_flashon (time, mask);
if (i < 7) {
pic = sb_weapons[flashon][i];
} else {
get the hipnotic hud working properly
2003-05-11 04:51:14 +00:00
pic = hsb_weapons[flashon][h[i - 7]];
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
get the hipnotic hud working properly
2003-05-11 04:51:14 +00:00
draw_subpic (view, 0, y[i], pic, 0, 0, 24, 16);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
if (flashon > 1)
sb_updates = 0; // force update to remove flash
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_hipnotic_items (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
int i;
float time;
// items
for (i = 2; i < 6; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (1 << (17 + i))) {
time = sbar_item_gettime[17 + i];
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_pic (view, 192 + i * 16, 0, sb_items[i]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (time && time > sbar_time - 2)
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
sb_updates = 0;
}
}
// hipnotic items
for (i = 0; i < 2; i++) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & (1 << (24 + i))) {
time = sbar_item_gettime[24 + i];
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_pic (view, 288 + i * 16, 0, hsb_items[i]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (time && time > (sbar_time - 2))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
sb_updates = 0;
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_hipnotic_inventory_sbar (view_t *view)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_pic (view, 0, 0, sb_ibar);
view_draw (view);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void __attribute__((used))
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_hipnotic_status (view_t *view)
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sb_showscores || sbar_stats[STAT_HEALTH] <= 0) {
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_solo (view);
return;
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_armor (view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
draw_face (view);
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
draw_health (view);
draw_ammo (view);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & IT_KEY1)
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_pic (view, 209, 3, sb_items[0]);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_ITEMS] & IT_KEY2)
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
draw_pic (view, 209, 12, sb_items[1]);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
static void
setup_frags (view_t frags, int player)
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
{
sbar_view (0, 0, 40, 4, grav_northwest, frags);
sbar_view (0, 4, 40, 4, grav_northwest, frags);
sbar_view (8, 0, 24, 8, grav_northwest, frags);
sbar_view (0, 0, 40, 8, grav_northwest, frags);
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
player_info_t *p = &sbar_players[player];
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
set_frags_bar (frags,
Sbar_ColorForMap (p->topcolor),
Sbar_ColorForMap (p->bottomcolor),
sb_frags[player],
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
(player == sbar_viewplayer) ? frags_marker : 0);
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
}
static void
setup_spect (view_t spect, int player)
{
view_t v = sbar_view (0, 0, 88, 4, grav_north, spect);
sbar_setcomponent (v, hud_charbuff, &sb_spectator);
}
typedef struct dmo_def_s {
int width; // in pixels
draw_charbuffer_t **buffer;
void (*setup) (view_t, int);
} dmo_def_t;
static dmo_def_t ping_def = { .width = 24, .buffer = sb_ping, };
static dmo_def_t pl_def = { .width = 24, .buffer = sb_pl, };
static dmo_def_t fph_def = { .width = 24, .buffer = sb_fph, };
static dmo_def_t time_def = { .width = 32, .buffer = sb_time, };
static dmo_def_t frags_def = { .width = 40, .setup = setup_frags, };
static dmo_def_t team_def = { .width = 32, .buffer = sb_uid, };
static dmo_def_t uid_def = { .width = 32, .buffer = sb_uid, };
static dmo_def_t name_def = { .width = 128, .buffer = sb_name, };
static dmo_def_t spectator_def = { .width = 112, .setup = setup_spect, };
static dmo_def_t spec_team_def = { .width = 32, };
static dmo_def_t *nq_dmo_defs[] = {
&frags_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_team_uid_ping_defs[] = {
&ping_def,
&pl_def,
&fph_def,
&time_def,
&frags_def,
&team_def,
&uid_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_team_uid_defs[] = {
&uid_def,
&pl_def,
&fph_def,
&time_def,
&frags_def,
&team_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_team_ping_defs[] = {
&ping_def,
&pl_def,
&fph_def,
&time_def,
&frags_def,
&team_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_uid_ping_defs[] = {
&ping_def,
&pl_def,
&fph_def,
&time_def,
&frags_def,
&uid_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_uid_defs[] = {
&ping_def,
&pl_def,
&fph_def,
&time_def,
&frags_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_ping_defs[] = {
&uid_def,
&pl_def,
&fph_def,
&time_def,
&frags_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_spect_team_uid_ping_defs[] = {
&ping_def,
&pl_def,
&spectator_def,
&spec_team_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_spect_team_uid_defs[] = {
&ping_def,
&pl_def,
&spectator_def,
&spec_team_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_spect_team_ping_defs[] = {
&ping_def,
&pl_def,
&spectator_def,
&spec_team_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_spect_uid_ping_defs[] = {
&ping_def,
&pl_def,
&spectator_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_spect_uid_defs[] = {
&ping_def,
&pl_def,
&spectator_def,
&name_def,
0
};
static dmo_def_t *qw_dmo_spect_ping_defs[] = {
&ping_def,
&pl_def,
&spectator_def,
&name_def,
0
};
static dmo_def_t **dmo_defs[] = {
nq_dmo_defs,
qw_dmo_ping_defs,
qw_dmo_uid_defs,
qw_dmo_uid_ping_defs,
qw_dmo_team_ping_defs,
qw_dmo_team_uid_defs,
qw_dmo_team_uid_ping_defs,
qw_dmo_spect_ping_defs,
qw_dmo_spect_uid_defs,
qw_dmo_spect_uid_ping_defs,
qw_dmo_spect_team_ping_defs,
qw_dmo_spect_team_uid_defs,
qw_dmo_spect_team_uid_ping_defs,
};
static view_t
make_dmo_line (view_t parent, int player)
{
dmo_def_t **defs = dmo_defs[3]; //FIXME nq/qw/team/spec/cvar
int x = -8;
view_t line = sbar_view (0, 0, 0, 0, grav_north, parent);
while (*defs) {
dmo_def_t *d = *defs++;
x += 8 + d->width;
if (d->buffer || d->setup) {
view_t v = sbar_view (x - d->width, 0, d->width, 8,
grav_northwest, line);
if (d->buffer) {
draw_charbuffer_t *buff = d->buffer[player];
sbar_setcomponent (v, hud_charbuff, &buff);
} else if (d->setup) {
d->setup (v, player);
}
}
}
View_SetLen (line, x, 8);
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
return line;
}
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
static inline int
calc_fph (int frags, int total)
{
int fph;
if (total != 0) {
fph = (3600 * frags) / total;
if (fph >= 999) {
fph = 999;
} else if (fph <= -999) {
fph = -999;
}
} else {
fph = 0;
}
return fph;
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static void
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
Sbar_DeathmatchOverlay (view_t view)
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
// this should be on a timer and needs nq/qw specific variants
// request new ping times every two seconds
if (!cls.demoplayback && realtime - cl.last_ping_request > 2) {
cl.last_ping_request = realtime;
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
SZ_Print (&cls.netchan.message, "pings");
}
if (hud_ping) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
int ping = sbar_players[sbar_playernum].ping;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
ping = bound (0, ping, 999);
draw_string (view, 0, 0, va (0, "%3d ms ", ping));
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
if (hud_ping && hud_pl)
draw_character (view, 48, 0, '/');
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
if (hud_pl) {
int lost = CL_CalcNet ();
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
lost = bound (0, lost, 999);
draw_string (view, 56, 0, va (0, "%3d pl", lost));
}
#endif
// 0, 0 "gfx/ranking.lmp"
// 80, 40
//
// for all qw, spectator replaces main, team at 72,0 88,8
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
Sbar_SortFrags (0);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
int y = 40;
view_pos_t len = View_GetLen (view);
int numbars = (len.y - y) / 10;
int count = min (scoreboardlines, numbars);
int i;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_HEALTH] > 0) {
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
count = 0;
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
for (i = 0; i < count; i++, y += 10) {
int k = fragsort[i];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
player_info_t *p = &sbar_players[k];
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
if (!View_Valid (sb_views[k])) {
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
sb_views[k] = make_dmo_line (view, k);
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
}
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
write_charbuff (sb_ping[k], 0, 0, va (0, "%3d", p->ping));
write_charbuff (sb_pl[k], 0, 0, va (0, "%3d", p->pl));
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
int total = (sbar_intermission ? sbar_completed_time : sbar_time)
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
- p->entertime;
write_charbuff (sb_fph[k], 0, 0, va (0, "%3d",
calc_fph (p->frags, total)));
write_charbuff (sb_time[k], 0, 0, va (0, "%3d", total / 60));
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
//FIXME update top/bottom color
write_charbuff (sb_frags[k], 0, 0, va (0, "%3d", p->frags));
[nq] Merge in qw deathmatch overlay display Nicely, all the data is already sort-of available (ping and pl will be interesting, and I need to double-check uid), but once I get some issues with the first entry not working, I'll be able to "merge" sbar and concentrate on rogue and hipnotic.
2022-11-08 02:24:34 +00:00
write_charbuff (sb_uid[k], 0, 0, va (0, "%3d", p->userid));
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
write_charbuff (sb_name[k], 0, 0, p->name->value);
[nq] Set unused fragsort entries to -1 The first scoreboard entry not showing was due to it being deleted immediately because unused fragsort array entries had a valid player index (0 in this case) and thus the unused view removal code was removing views it should not.
2022-11-08 03:49:41 +00:00
View_SetPos (sb_views[k], 0, y);
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
for (; i < MAX_PLAYERS; i++) {
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
int k = fragsort[i];
[nq] Set unused fragsort entries to -1 The first scoreboard entry not showing was due to it being deleted immediately because unused fragsort array entries had a valid player index (0 in this case) and thus the unused view removal code was removing views it should not.
2022-11-08 03:49:41 +00:00
if (k >= 0 && View_Valid (sb_views[k])) {
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
View_Delete (sb_views[k]);
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
View_UpdateHierarchy (view);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
static void __attribute__((used))
Sbar_TeamOverlay (view_t *view)
{
#if 0
char num[20];
int pavg, plow, phigh, i, k, x, y;
team_t *tm;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
info_key_t *player_team = sbar_players[sbar_playernum].team;
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (!sbar_teamplay) { // FIXME: if not teamplay, why teamoverlay?
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
Sbar_DeathmatchOverlay (view, 0);
return;
}
r_data->scr_copyeverything = 1;
r_data->scr_fullupdate = 0;
draw_cachepic (view, 0, 0, "gfx/ranking.lmp", 1);
y = 24;
x = 36;
draw_string (view, x, y, "low/avg/high team total players");
y += 8;
draw_string (view, x, y, "\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f "
"\x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f "
"\x1d\x1e\x1e\x1e\x1e\x1e\x1f");
y += 8;
// sort the teams
Sbar_SortTeams ();
// draw the text
for (i = 0; i < scoreboardteams && y <= view->ylen - 10; i++) {
k = teamsort[i];
tm = teams + k;
// draw pings
plow = tm->plow;
if (plow < 0 || plow > 999)
plow = 999;
phigh = tm->phigh;
if (phigh < 0 || phigh > 999)
phigh = 999;
if (!tm->players)
pavg = 999;
else
pavg = tm->ptotal / tm->players;
if (pavg < 0 || pavg > 999)
pavg = 999;
snprintf (num, sizeof (num), "%3i/%3i/%3i", plow, pavg, phigh);
draw_string (view, x, y, num);
// draw team
draw_nstring (view, x + 104, y, tm->team, 4);
// draw total
snprintf (num, sizeof (num), "%5i", tm->frags);
draw_string (view, x + 104 + 40, y, num);
// draw players
snprintf (num, sizeof (num), "%5i", tm->players);
draw_string (view, x + 104 + 88, y, num);
if (player_team && strnequal (player_team->value, tm->team, 16)) {
draw_character (view, x + 104 - 8, y, 16);
draw_character (view, x + 104 + 32, y, 17);
}
y += 8;
}
y += 8;
Sbar_DeathmatchOverlay (view, y);
#endif
}
this should fix the scores in deathmatch (thanks, xi)
2003-11-21 04:53:41 +00:00
static void
Sbar_DrawScoreboard (void)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
this should fix the scores in deathmatch (thanks, xi)
2003-11-21 04:53:41 +00:00
//Sbar_SoloScoreboard ();
if (cl.gametype == GAME_DEATHMATCH)
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Sbar_DeathmatchOverlay (hud_overlay_view);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
this should fix the scores in deathmatch (thanks, xi)
2003-11-21 04:53:41 +00:00
}
static void
draw_overlay (view_t *view)
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sb_showscores || sbar_stats[STAT_HEALTH] <= 0) {
this should fix the scores in deathmatch (thanks, xi)
2003-11-21 04:53:41 +00:00
Sbar_DrawScoreboard ();
}
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
#if 0
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (!sbar_active
|| !((sbar_stats[STAT_HEALTH] <= 0 && !sbar_spectator)
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
|| sb_showscores || sb_showteamscores))
return;
// main screen deathmatch rankings
// if we're dead show team scores in team games
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_stats[STAT_HEALTH] <= 0 && !sbar_spectator)
if (sbar_teamplay > 0 && !sb_showscores)
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
Sbar_TeamOverlay (view);
else
Sbar_DeathmatchOverlay (view, 0);
else if (sb_showscores)
Sbar_DeathmatchOverlay (view, 0);
else if (sb_showteamscores)
Sbar_TeamOverlay (view);
#endif
}
/*
Sbar_LogFrags
autologging of frags after a match ended
(called by recived network packet with command scv_intermission)
TODO: Find a new and better place for this function
(i am nearly shure this is wrong place)
added by Elmex
*/
void
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
Sbar_LogFrags (double completed_time)
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
{
char *name;
char *team;
byte *cp = NULL;
QFile *file = NULL;
int minutes, fph, total, d, f, i, k, l, p;
player_info_t *s = NULL;
const char *t = NULL;
time_t tt = time (NULL);
if (!cl_fraglog)
return;
if ((file = QFS_Open (fs_fraglog, "a")) == NULL)
return;
t = ctime (&tt);
if (t)
Qwrite (file, t, strlen (t));
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
Qprintf (file, "%s\n%s %s\n", sbar_servername,
cl_world.scene->worldmodel->path, sbar_levelname);
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
// scores
Sbar_SortFrags (true);
// draw the text
l = scoreboardlines;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_teamplay) {
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
// TODO: test if the teamplay does correct output
Qwrite (file, "pl fph time frags team name\n",
strlen ("pl fph time frags team name\n"));
} else {
Qwrite (file, "pl fph time frags name\n",
strlen ("pl fph time frags name\n"));
}
for (i = 0; i < l; i++) {
k = fragsort[i];
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
s = &sbar_players[k];
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
if (!s->name || !s->name->value[0])
continue;
// draw pl
p = s->pl;
(void) p; //FIXME
// get time
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_intermission)
total = completed_time - s->entertime;
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
else
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
total = sbar_time - s->entertime;
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
minutes = total / 60;
// get frags
f = s->frags;
fph = calc_fph (f, total);
name = malloc (strlen (s->name->value) + 1);
for (cp = (byte *) s->name->value, d = 0; *cp; cp++, d++)
name[d] = sys_char_map[*cp];
name[d] = 0;
if (s->spectator) {
Qprintf (file, "%-3i%% %s (spectator)", s->pl, name);
} else {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_teamplay) {
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
team = malloc (strlen (s->team->value) + 1);
for (cp = (byte *) s->team, d = 0; *cp; cp++, d++)
team[d] = sys_char_map[*cp];
team[d] = 0;
Qprintf (file, "%-3i%% %-3i %-4i %-3i %-4s %s",
s->pl, fph, minutes, f, team, name);
free (team);
} else {
Qprintf (file, "%-3i%% %-3i %-4i %-3i %s",
s->pl, fph, minutes, f, name);
}
}
free (name);
Qwrite (file, "\n\n", 1);
}
Qclose (file);
this should fix the scores in deathmatch (thanks, xi)
2003-11-21 04:53:41 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static void
draw_time (view_t *view)
{
[build] Add -Wformat-non-literal option While this caused some trouble for pr_strings and configurable strftime (evil hacks abound), it's the result of discovering an ancient (from maybe as early as 2004, definitely before 2012) bug in qwaq's printing that somehow got past months of trial-by-fire testing (origin understood thanks to the warning finding it).
2021-03-29 08:27:06 +00:00
struct tm *local = 0;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
time_t utc = 0;
put "FIXME: overflow" on all the char arrays I could find that weren't obviously safe
2003-07-08 20:11:10 +00:00
char st[80]; //FIXME: overflow
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
// Get local time
[build] Add -Wformat-non-literal option While this caused some trouble for pr_strings and configurable strftime (evil hacks abound), it's the result of discovering an ancient (from maybe as early as 2004, definitely before 2012) bug in qwaq's printing that somehow got past months of trial-by-fire testing (origin understood thanks to the warning finding it).
2021-03-29 08:27:06 +00:00
utc = time (0);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
local = localtime (&utc);
[nq,qw] Fix strftime formats for windows The incorrectness was hidden by the non-literal strings.
2021-03-30 08:38:42 +00:00
#if defined(_WIN32) || defined(_WIN64)
# define HOUR12 "%I"
# define HOUR24 "%H"
# define PM "%p"
#else
# define HOUR12 "%l"
# define HOUR24 "%k"
# define PM "%P"
#endif
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
if (hud_time == 1) { // Use international format
[nq,qw] Fix strftime formats for windows The incorrectness was hidden by the non-literal strings.
2021-03-30 08:38:42 +00:00
strftime (st, sizeof (st), HOUR24":%M", local);
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
} else if (hud_time >= 2) { // US AM/PM display
[nq,qw] Fix strftime formats for windows The incorrectness was hidden by the non-literal strings.
2021-03-30 08:38:42 +00:00
strftime (st, sizeof (st), HOUR12":%M "PM, local);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
write_charbuff (time_buff, 0, 0, st);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
static void
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
draw_fps (view_t view)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
Do a lot of diff reduction.
2011-08-22 11:00:17 +00:00
static char st[80];
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
double t;
static double lastframetime;
show_fps now updates every 0.2 seconds and displays 10ths of an fps
2003-07-27 22:25:45 +00:00
static double lastfps;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
t = Sys_DoubleTime ();
show_fps now updates every 0.2 seconds and displays 10ths of an fps
2003-07-27 22:25:45 +00:00
if ((t - lastframetime) >= 0.2) {
lastfps = fps_count / (t - lastframetime);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
fps_count = 0;
lastframetime = t;
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
int prec = lastfps < 1000 ? 1 : 0;
snprintf (st, sizeof (st), "%5.*f FPS", prec, lastfps);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
write_charbuff (fps_buff, 0, 0, st);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
#if 0
static void
draw_net (view_t *view)
{
// request new ping times every two seconds
if (!cls.demoplayback && realtime - cl.last_ping_request > 2) {
cl.last_ping_request = realtime;
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
SZ_Print (&cls.netchan.message, "pings");
}
if (hud_ping) {
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
int ping = sbar_players[sbar_playernum].ping;
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
ping = bound (0, ping, 999);
draw_string (view, 0, 0, va (0, "%3d ms ", ping));
}
if (hud_ping && hud_pl)
draw_character (view, 48, 0, '/');
if (hud_pl) {
int lost = CL_CalcNet ();
lost = bound (0, lost, 999);
draw_string (view, 56, 0, va (0, "%3d pl", lost));
}
}
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
if (sbar_active && (hud_ping || hud_pl))
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
#endif
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static void
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
draw_intermission (view_t view)
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
{
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
const char *n;
n = "gfx/complete.lmp";
sbar_setcomponent (View_GetChild (view, 0), hud_cachepic, &n);
n = "gfx/inter.lmp";
sbar_setcomponent (View_GetChild (view, 1), hud_cachepic, &n);
view_t time_views[] = {
View_GetChild (intermission_time, 0),
View_GetChild (intermission_time, 1),
View_GetChild (intermission_time, 2),
View_GetChild (intermission_time, 3),
View_GetChild (intermission_time, 4),
View_GetChild (intermission_time, 5),
};
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
int dig = sbar_completed_time / 60;
int num = sbar_completed_time - dig * 60;
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
draw_num (time_views + 0, dig, 3, 0);
sbar_setcomponent (time_views[3], hud_pic, &sb_colon);
draw_num (time_views + 4, num, 2, 0);
view_t secr_views[] = {
View_GetChild (intermission_secr, 0),
View_GetChild (intermission_secr, 1),
View_GetChild (intermission_secr, 2),
View_GetChild (intermission_secr, 3),
View_GetChild (intermission_secr, 4),
View_GetChild (intermission_secr, 5),
View_GetChild (intermission_secr, 6),
};
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (secr_views + 0, sbar_stats[STAT_SECRETS], 3, 0);
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
sbar_setcomponent (secr_views[3], hud_pic, &sb_slash);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (secr_views + 4, sbar_stats[STAT_TOTALSECRETS], 3, 0);
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
view_t kill_views[] = {
View_GetChild (intermission_kill, 0),
View_GetChild (intermission_kill, 1),
View_GetChild (intermission_kill, 2),
View_GetChild (intermission_kill, 3),
View_GetChild (intermission_kill, 4),
View_GetChild (intermission_kill, 5),
View_GetChild (intermission_kill, 6),
};
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (kill_views + 0, sbar_stats[STAT_MONSTERS], 3, 0);
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
sbar_setcomponent (kill_views[3], hud_pic, &sb_slash);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
draw_num (kill_views + 4, sbar_stats[STAT_TOTALMONSTERS], 3, 0);
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
static void
clear_views (view_t view)
{
sbar_remcomponent (view, hud_cachepic);
sbar_remcomponent (view, hud_pic);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
for (uint32_t i = 0; i < View_ChildCount (view); i++) {
clear_views (View_GetChild (view, i));
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
#if 0
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
void
Sbar_IntermissionOverlay (void)
{
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
r_data->scr_copyeverything = 1;
r_data->scr_fullupdate = 0;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
if (cl.gametype == GAME_DEATHMATCH) {
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Sbar_DeathmatchOverlay (hud_overlay_view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
return;
}
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
draw_intermission (intermission_view);
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
void
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
Sbar_Intermission (int mode, double completed_time)
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
sbar_completed_time = completed_time;
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
void *f = clear_views;
if (mode == 1) {
f = draw_intermission;
}
sbar_setcomponent (intermission_view, hud_updateonce, &f);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
/* CENTER PRINTING */
static dstring_t center_string = {&dstring_default_mem};
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
static passage_t center_passage;
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
static float centertime_start; // for slow victory printing
static float centertime_off;
static int center_lines;
/*
Called for important messages that should stay in the center of the screen
for a few moments
*/
void
Sbar_CenterPrint (const char *str)
{
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
if (!str || !*str) {
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
centertime_off = 0;
return;
}
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
centertime_off = scr_centertime;
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
centertime_start = sbar_time;
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
[nq,qw] Clean up centerprint dstring It was quite redundant and the optimization it vaguely provided belongs in sbar and not in the protocol parser.
2022-11-04 03:51:43 +00:00
if (center_string.str && !strcmp (str, center_string.str)) {
// same string as last time, no need to lay out the text again
return;
}
dstring_copystr (&center_string, str);
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
Passage_ParseText (&center_passage, center_string.str);
// Standard centerprint strings are pre-flowed so each line in the message
// is a paragraph in the passage.
center_lines = center_passage.hierarchy->childCount[0];
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
}
static void
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
Sbar_DrawCenterString (view_t view, unsigned remaining)
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
{
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
view_pos_t abs = View_GetAbs (view);
view_pos_t len = View_GetLen (view);
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
int x, y;
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
if (center_lines <= 4)
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
y = abs.y + len.y * 0.35;
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
else
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
y = abs.y + 48;
__auto_type h = center_passage.hierarchy;
psg_text_t *line = h->components[passage_type_text_obj];
int line_count = center_lines;
while (line_count-- > 0 && remaining > 0) {
line++;
const char *text = center_passage.text + line->text;
unsigned count = min (40, line->size);
x = abs.x + (len.x - count * 8) / 2;
count = min (count, remaining);
remaining -= count;
r_funcs->Draw_nString (x, y, text, count);
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
y += 8;
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
}
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
void
Sbar_FinaleOverlay (void)
{
more centerprint cleanup.
2004-03-02 00:58:13 +00:00
int remaining;
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
r_data->scr_copyeverything = 1;
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
#if 0
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
draw_cachepic (hud_overlay_view, 0, 16, "gfx/finale.lmp", 1);
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
#endif
more centerprint cleanup.
2004-03-02 00:58:13 +00:00
// the finale prints the characters one at a time
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
remaining = scr_printspeed * (sbar_time - centertime_start);
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Sbar_DrawCenterString (hud_overlay_view, remaining);
first step of centerprint/finale cleanup. fixes the misplaced text for end-of-episode text
2004-03-01 23:47:39 +00:00
}
void
Sbar_DrawCenterPrint (void)
{
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
r_data->scr_copytop = 1;
more centerprint cleanup.
2004-03-02 00:58:13 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
centertime_off -= r_data->frametime;
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
if (centertime_off <= 0)
more centerprint cleanup.
2004-03-02 00:58:13 +00:00
return;
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Sbar_DrawCenterString (hud_overlay_view, -1);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
[nq] Clean up sbar updates for info changes Most of the update functions are scheduled by Sbar_Changed() using tables to determine what update functions need to be called for which view entities. As hud_updateonce is called, and an entity can have only one of any component, this becomes a set of updates to call when during hud/sbar rendering.
2022-11-04 02:31:11 +00:00
typedef struct {
hud_update_f update;
view_t *view;
} sb_updater_t;
static const sb_updater_t ammo_update[] = {
{draw_miniammo, &sbar_miniammo},
{draw_ammo, &sbar_ammo},
{}
};
static const sb_updater_t armor_update[] = {
{draw_armor, &sbar_armor},
{}
};
static const sb_updater_t frags_update[] = {
{draw_frags, &sbar_frags},
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
{draw_minifrags, &hud_minifrags},
{draw_miniteam, &hud_miniteam},
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
{Sbar_DeathmatchOverlay, &dmo_view},
[nq] Clean up sbar updates for info changes Most of the update functions are scheduled by Sbar_Changed() using tables to determine what update functions need to be called for which view entities. As hud_updateonce is called, and an entity can have only one of any component, this becomes a set of updates to call when during hud/sbar rendering.
2022-11-04 02:31:11 +00:00
{}
};
static const sb_updater_t health_update[] = {
{draw_health, &sbar_health},
{draw_face, &sbar_face},
{}
};
static const sb_updater_t info_update[] = {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
{draw_frags, &sbar_frags},
{draw_minifrags, &hud_minifrags},
{draw_miniteam, &hud_miniteam},
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
{Sbar_DeathmatchOverlay, &dmo_view},
[nq] Clean up sbar updates for info changes Most of the update functions are scheduled by Sbar_Changed() using tables to determine what update functions need to be called for which view entities. As hud_updateonce is called, and an entity can have only one of any component, this becomes a set of updates to call when during hud/sbar rendering.
2022-11-04 02:31:11 +00:00
{}
};
static const sb_updater_t items_update[] = {
{draw_items, &sbar_items},
{draw_sigils, &sbar_sigils},
{}
};
static const sb_updater_t weapon_update[] = {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
{draw_weapons, &sbar_weapons},
{draw_ammo, &sbar_ammo},
[nq] Clean up sbar updates for info changes Most of the update functions are scheduled by Sbar_Changed() using tables to determine what update functions need to be called for which view entities. As hud_updateonce is called, and an entity can have only one of any component, this becomes a set of updates to call when during hud/sbar rendering.
2022-11-04 02:31:11 +00:00
{}
};
static const sb_updater_t * const sb_updaters[sbc_num_changed] = {
[sbc_ammo] = ammo_update,
[sbc_armor] = armor_update,
[sbc_frags] = frags_update,
[sbc_health] = health_update,
[sbc_info] = info_update,
[sbc_items] = items_update,
[sbc_weapon] = weapon_update,
};
void
Sbar_Changed (sbar_changed change)
{
sb_update_flags |= 1 << change;
sb_updates = 0; // update next frame
if ((unsigned) change >= (unsigned) sbc_num_changed) {
Sys_Error ("invalid sbar changed enum");
}
const sb_updater_t *ud = sb_updaters[change];
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
if (ud) {
while (ud->update) {
sbar_setcomponent (*ud->view, hud_updateonce, &ud->update);
ud++;
}
[nq] Clean up sbar updates for info changes Most of the update functions are scheduled by Sbar_Changed() using tables to determine what update functions need to be called for which view entities. As hud_updateonce is called, and an entity can have only one of any component, this becomes a set of updates to call when during hud/sbar rendering.
2022-11-04 02:31:11 +00:00
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
void
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
Sbar_Update (double time)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
fps_count++;
sbar_time = time;
if (!sbar_active) {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
return;
}
if (sb_update_flags & (1 << sbc_info)) {
draw_overlay (0);
}
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
if (sb_showscores) {
draw_solo_time ();
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
sb_update_flags = 0;
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
void
Sbar_Damage (double time)
{
sbar_faceanimtime = time + 0.2;
}
void
Sbar_SetPlayerNum (int playernum, int spectator)
{
sbar_playernum = playernum;
sbar_spectator = spectator;
}
void
Sbar_SetViewEntity (int viewentity)
{
sbar_viewplayer = viewentity - 1;
}
void
Sbar_SetLevelName (const char *levelname, const char *servername)
{
}
void
Sbar_SetTeamplay (int teamplay)
{
}
void
Sbar_SetActive (int active)
{
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void
sbar_hud_swap_f (void *data, const cvar_t *cvar)
{
if (hud_sbar) {
return;
}
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
grav_t armament_grav = hud_swap ? grav_southwest : grav_southeast;
grav_t weapons_grav = hud_swap ? grav_northwest : grav_northeast;
View_SetGravity (sbar_armament, armament_grav);
View_SetGravity (sbar_weapons, weapons_grav);
View_UpdateHierarchy (hud_view);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[nq] Get hud_sbar working for the most part Setting the parent to another object in the same hierarchy still causes a segfault (worked around for now), but the mangled views were caused by View_UpdateHierarchy not being called prior to the first call to set_hud_sbar (why, though? I suspect something to do with oldlen). And ECS_SortComponentPool finally gets used to ensure the sbar panels are behind the info pics.
2022-11-05 18:08:50 +00:00
static int
href_cmp (const void *_a, const void *_b, void *arg)
{
uint32_t enta = *(const uint32_t *)_a;
uint32_t entb = *(const uint32_t *)_b;
hierref_t *ref_a = Ent_GetComponent (enta, hud_href, hud_registry);
hierref_t *ref_b = Ent_GetComponent (entb, hud_href, hud_registry);
if (ref_a->hierarchy == ref_b->hierarchy) {
return ref_a->index - ref_b->index;
}
ptrdiff_t diff = ref_a->hierarchy - ref_b->hierarchy;
return diff > 0 ? 1 : diff < 0 ? -1 : 0;
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
set_hud_sbar (void)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
{
view_t v;
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
if (hud_sbar) {
View_SetParent (sbar_armament, sbar_inventory);
View_SetPos (sbar_armament, 0, 0);
View_SetLen (sbar_armament, 202, 24);
View_SetGravity (sbar_armament, grav_northwest);
View_SetLen (sbar_weapons, 192, 16);
View_SetGravity (sbar_weapons, grav_southwest);
View_SetLen (sbar_miniammo, 202, 8);
View_SetGravity (sbar_miniammo, grav_northwest);
for (int i = 0; i < 7; i++) {
v = View_GetChild (sbar_weapons, i);
View_SetPos (v, i * 24, 0);
View_SetLen (v, 24 + 24 * (i == 6), 16);
if (sbar_hascomponent (v, hud_subpic)) {
hud_subpic_t *subpic = sbar_getcomponent(v, hud_subpic);
subpic->w = subpic->pic->width;
}
}
for (int i = 0; i < 4; i++) {
v = View_GetChild (sbar_miniammo, i);
View_SetPos (v, i * 48 + 10, 0);
View_SetLen (v, 42, 8);
sbar_remcomponent (v, hud_subpic);
}
for (int i = 0; i < 7; i++) {
for (int j = 0; j < 8; j++) {
if (sb_weapons[i][j].pic) {
sb_weapons[i][j].w = sb_weapons[i][j].pic->width;
sb_weapons[i][j].h = sb_weapons[i][j].pic->height;
}
}
}
sbar_setcomponent (sbar_inventory, hud_pic, &sb_ibar);
sbar_setcomponent (sbar_statusbar, hud_pic, &sb_sbar);
} else {
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_SetParent (sbar_armament, hud_view);
View_SetPos (sbar_armament, 0, 48);
View_SetLen (sbar_armament, 42, 156);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
View_SetGravity (sbar_armament, grav_southeast);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_SetLen (sbar_weapons, 24, 112);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
View_SetGravity (sbar_weapons, grav_northeast);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_SetLen (sbar_miniammo, 42, 44);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
View_SetGravity (sbar_miniammo, grav_southeast);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 7; i++) {
v = View_GetChild (sbar_weapons, i);
View_SetPos (v, 0, i * 16);
View_SetLen (v, 24, 16);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
if (sbar_hascomponent (v, hud_subpic)) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
hud_subpic_t *subpic = sbar_getcomponent(v, hud_subpic);
subpic->w = 24;
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
}
for (int i = 0; i < 4; i++) {
v = View_GetChild (sbar_miniammo, i);
View_SetPos (v, 0, i * 11);
View_SetLen (v, 42, 11);
hud_subpic_t subpic = { sb_ibar, 3 + (i * 48), 0, 42, 11 };
sbar_setcomponent (v, hud_subpic, &subpic);
}
for (int i = 0; i < 7; i++) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
for (int j = 0; j < 8; j++) {
if (sb_weapons[i][j].pic) {
sb_weapons[i][j].w = 24;
sb_weapons[i][j].h = sb_weapons[i][j].pic->height;
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
}
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sbar_remcomponent (sbar_inventory, hud_pic);
sbar_remcomponent (sbar_statusbar, hud_pic);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
[nq] Get hud_sbar working for the most part Setting the parent to another object in the same hierarchy still causes a segfault (worked around for now), but the mangled views were caused by View_UpdateHierarchy not being called prior to the first call to set_hud_sbar (why, though? I suspect something to do with oldlen). And ECS_SortComponentPool finally gets used to ensure the sbar panels are behind the info pics.
2022-11-05 18:08:50 +00:00
ECS_SortComponentPool (hud_registry, hud_pic, href_cmp, 0);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
static void
sbar_hud_sbar_f (void *data, const cvar_t *cvar)
{
set_hud_sbar ();
View_UpdateHierarchy (hud_view);
}
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
static void
sbar_hud_fps_f (void *data, const cvar_t *cvar)
{
if (hud_fps) {
void *f = draw_fps;
sbar_setcomponent (hud_fps_view, hud_update, &f);
sbar_setcomponent (hud_fps_view, hud_charbuff, &fps_buff);
} else {
sbar_remcomponent (hud_fps_view, hud_update);
sbar_remcomponent (hud_fps_view, hud_charbuff);
}
}
static void
sbar_hud_time_f (void *data, const cvar_t *cvar)
{
if (hud_time) {
void *f = draw_time;
sbar_setcomponent (hud_time_view, hud_update, &f);
sbar_setcomponent (hud_time_view, hud_charbuff, &time_buff);
} else {
sbar_remcomponent (hud_time_view, hud_update);
sbar_remcomponent (hud_time_view, hud_charbuff);
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
create_views (view_def_t *view_defs, view_t parent)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
{
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
for (int i = 0; view_defs[i].view || view_defs[i].parent; i++) {
view_def_t *def = &view_defs[i];
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
view_t p = parent;
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
int x = def->rect.x;
int y = def->rect.y;
int w = def->rect.w;
int h = def->rect.h;
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
if (def->parent != &pseudo_parent) {
p = def->parent ? *def->parent : nullview;
}
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
if (def->view) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
*def->view = sbar_view (x, y, w, h, def->gravity, p);
if (def->subviews) {
create_views (def->subviews, *def->view);
}
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
} else {
for (int j = 0; j < def->count; j++) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
view_t v = sbar_view (x, y, w, h, def->gravity, p);
if (def->subviews) {
create_views (def->subviews, v);
}
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
x += def->xstep;
y += def->ystep;
}
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
}
static void
init_sbar_views (void)
{
create_views (sbar_defs, nullview);
view_pos_t slen = View_GetLen (cl_screen_view);
view_pos_t hlen = View_GetLen (hud_view);
View_SetLen (hud_view, slen.x, hlen.y);
View_SetResize (hud_view, 1, 0);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 4; i++) {
[nq] Make sbar setup more data-driven I doubt the scheme is final (eg, char buffer setup), but it feels better than a pile of function calls.
2022-11-03 06:53:52 +00:00
view_t v = View_GetChild (sbar_miniammo, i);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
draw_charbuffer_t *buffer = Draw_CreateBuffer (3, 1);
[nq] Get intermission view working again This is currently just the basic intermission view (not the finale view or the deathmatch intermission view).
2022-11-03 08:49:05 +00:00
Draw_ClearBuffer (buffer);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
sbar_setcomponent (v, hud_charbuff, &buffer);
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
if (r_data->vid->width > 320) {
int l = (r_data->vid->width - 320) / 2;
View_SetPos (sbar_tile[0], -l, 0);
View_SetLen (sbar_tile[0], l, 48);
View_SetPos (sbar_tile[1], -l, 0);
View_SetLen (sbar_tile[1], l, 48);
sbar_setcomponent (sbar_tile[0], hud_tile, 0);
sbar_setcomponent (sbar_tile[1], hud_tile, 0);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
solo_monsters = Draw_CreateBuffer (17, 1);
solo_secrets = Draw_CreateBuffer (17, 1);
solo_time = Draw_CreateBuffer (12, 1);
solo_name = Draw_CreateBuffer (20, 1);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
static void
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
init_hipnotic_sbar_views (void)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
view_t *view;
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
sbar_view = view_new (0, 0, 320, 48, grav_south);
sbar_frags_view = view_new (0, 0, 130, 8, grav_northeast);
sbar_frags_view->draw = draw_frags;
sbar_inventory_view = view_new (0, 0, 320, 24, grav_northwest);
sbar_inventory_view->draw = draw_hipnotic_inventory_sbar;
view = view_new (0, 0, 224, 16, grav_southwest);
view->draw = draw_hipnotic_weapons_sbar;
view_add (sbar_inventory_view, view);
view = view_new (0, 0, 32, 8, grav_northwest);
view->draw = draw_ammo_sbar;
view_add (sbar_inventory_view, view);
view = view_new (0, 0, 96, 16, grav_southeast);
view->draw = draw_hipnotic_items;
view_add (sbar_inventory_view, view);
view = view_new (0, 0, 32, 16, grav_southeast);
view->draw = draw_sigils;
view_add (sbar_inventory_view, view);
if (sbar_frags_view)
view_add (sbar_inventory_view, sbar_frags_view);
view_add (sbar_view, sbar_inventory_view);
view = view_new (0, 0, 320, 24, grav_southwest);
view->draw = draw_status_bar;
view_add (sbar_view, view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
view = view_new (0, 0, 320, 24, grav_southwest);
view->draw = draw_hipnotic_status;
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
view_add (sbar_view, view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
if (cl_screen_view->xlen > 320) {
int l = (cl_screen_view->xlen - 320) / 2;
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
view = view_new (-l, 0, l, 48, grav_southwest);
view->draw = draw_tile;
view->resize_y = 1;
view_add (sbar_view, view);
view = view_new (-l, 0, l, 48, grav_southeast);
view->draw = draw_tile;
view->resize_y = 1;
view_add (sbar_view, view);
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
static void
init_hipnotic_hud_views (void)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
view_t *view;
hud_view = view_new (0, 0, 320, 48, grav_south);
hud_frags_view = view_new (0, 0, 130, 8, grav_northeast);
hud_frags_view->draw = draw_frags;
hud_view->resize_y = 1;
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
if (cl_screen_view->ylen < 252) {
hud_armament_view = view_new (0, min (cl_screen_view->ylen - 160, 48),
auto-arange the hud if the screen is too small for hipnotic or rogue
2003-05-09 19:24:48 +00:00
66, 160, grav_southeast);
} else {
hud_armament_view = view_new (0, 48, 42, 204, grav_southeast);
}
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
auto-arange the hud if the screen is too small for hipnotic or rogue
2003-05-09 19:24:48 +00:00
view = view_new (0, 0, 24, 160, grav_northeast);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
view->draw = draw_hipnotic_weapons_hud;
view_add (hud_armament_view, view);
view = view_new (0, 0, 42, 44, grav_southeast);
view->draw = draw_ammo_hud;
view_add (hud_armament_view, view);
hud_inventory_view = view_new (0, 0, 320, 24, grav_northwest);
view_add (hud_view, hud_inventory_view);
view = view_new (0, 0, 320, 24, grav_southwest);
view->draw = draw_hipnotic_status;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
view_add (hud_view, view);
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
view = view_new (0, 0, 96, 16, grav_southeast);
view->draw = draw_hipnotic_items;
view_add (hud_inventory_view, view);
view = view_new (0, 0, 32, 16, grav_southeast);
view->draw = draw_sigils;
view_add (hud_inventory_view, view);
if (hud_frags_view)
view_add (hud_inventory_view, hud_frags_view);
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
view = view_new (0, 0, cl_screen_view->xlen, 48, grav_south);
[client] Fix sbar hud resizing with window size hud_view has an extra layer that hid its missing resize_x
2022-09-21 16:40:30 +00:00
view->resize_x = 1;
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
view_add (view, hud_view);
hud_view = view;
view_add (hud_view, hud_armament_view);
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
view_insert (hud_main_view, hud_view, 0);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
static void
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
init_rogue_sbar_views (void)
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
view_t *view;
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
sbar_view = view_new (0, 0, 320, 48, grav_south);
sbar_frags_view = view_new (0, 0, 130, 8, grav_northeast);
sbar_frags_view->draw = draw_frags;
sbar_inventory_view = view_new (0, 0, 320, 24, grav_northwest);
sbar_inventory_view->draw = draw_rogue_inventory_sbar;
view = view_new (0, 0, 224, 16, grav_southwest);
view->draw = draw_rogue_weapons_sbar;
view_add (sbar_inventory_view, view);
view = view_new (0, 0, 32, 8, grav_northwest);
view->draw = draw_ammo_sbar;
view_add (sbar_inventory_view, view);
view = view_new (0, 0, 128, 16, grav_southeast);
view->draw = draw_rogue_items;
view_add (sbar_inventory_view, view);
if (sbar_frags_view)
view_add (sbar_inventory_view, sbar_frags_view);
view_add (sbar_view, sbar_inventory_view);
view = view_new (0, 0, 320, 24, grav_southwest);
view->draw = draw_status_bar;
view_add (sbar_view, view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
view = view_new (0, 0, 320, 24, grav_southwest);
view->draw = draw_rogue_status;
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
view_add (sbar_view, view);
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
if (cl_screen_view->xlen > 320) {
int l = (cl_screen_view->xlen - 320) / 2;
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
view = view_new (-l, 0, l, 48, grav_southwest);
view->draw = draw_tile;
view->resize_y = 1;
view_add (sbar_view, view);
view = view_new (-l, 0, l, 48, grav_southeast);
view->draw = draw_tile;
view->resize_y = 1;
view_add (sbar_view, view);
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
}
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
static void
init_rogue_hud_views (void)
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#if 0
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
view_t *view;
hud_view = view_new (0, 0, 320, 48, grav_south);
hud_frags_view = view_new (0, 0, 130, 8, grav_northeast);
hud_frags_view->draw = draw_frags;
hud_view->resize_y = 1;
fix rogue's item code
2003-05-10 02:54:17 +00:00
hud_armament_view = view_new (0, 48, 42, 156, grav_southeast);
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
fix rogue's item code
2003-05-10 02:54:17 +00:00
view = view_new (0, 0, 24, 112, grav_northeast);
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
view->draw = draw_rogue_weapons_hud;
view_add (hud_armament_view, view);
view = view_new (0, 0, 42, 44, grav_southeast);
view->draw = draw_rogue_ammo_hud;
view_add (hud_armament_view, view);
hud_inventory_view = view_new (0, 0, 320, 24, grav_northwest);
view_add (hud_view, hud_inventory_view);
view = view_new (0, 0, 320, 24, grav_southwest);
view->draw = draw_rogue_status;
view_add (hud_view, view);
view = view_new (0, 0, 128, 16, grav_southeast);
view->draw = draw_rogue_items;
view_add (hud_inventory_view, view);
if (hud_frags_view)
view_add (hud_inventory_view, hud_frags_view);
[vid] Remove console view from viddef_t This breaks console scaling for now (con_width and con_height are gone), but is a major step towards window resize support as console stuff should never have been in viddef_t in the first place. The client screen init code now sets up a screen view (actually the renderer's scr_view) that is passed to the client console so it can know the size of the screen. The same view is used by the status bar code. Also, the ram/cache/paused icon drawing is moved into the client screen update code. A bit of duplication, but I do plan on merging that eventually.
2022-09-21 08:31:18 +00:00
view = view_new (0, 0, cl_screen_view->xlen, 48, grav_south);
[client] Fix sbar hud resizing with window size hud_view has an extra layer that hid its missing resize_x
2022-09-21 16:40:30 +00:00
view->resize_x = 1;
rogue hud working now. not sure I'm happy with the way the ammo's drawn though as rogue didn't (seem to) supply unhighlighted versions of their alt weapon icons.
2003-05-09 16:52:41 +00:00
view_add (view, hud_view);
hud_view = view;
view_add (hud_view, hud_armament_view);
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
view_insert (hud_main_view, hud_view, 0);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
#endif
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
}
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
static void
init_views (void)
{
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
hud_stuff_view = sbar_view (0, 48, 152, 16, grav_southwest, cl_screen_view);
hud_time_view = sbar_view (8, 0, 64, 8, grav_northwest, hud_stuff_view);
hud_fps_view = sbar_view (80, 0, 72, 8, grav_northwest, hud_stuff_view);
time_buff = Draw_CreateBuffer (8, 1);
fps_buff = Draw_CreateBuffer (11, 1);
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
for (int i = 0; i < MAX_PLAYERS; i++) {
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
sb_fph[i] = Draw_CreateBuffer (3, 1);
sb_time[i] = Draw_CreateBuffer (4, 1);
sb_frags[i] = Draw_CreateBuffer (3, 1);
sb_team[i] = Draw_CreateBuffer (4, 1);
sb_ping[i] = Draw_CreateBuffer (3, 1);
sb_pl[i] = Draw_CreateBuffer (3, 1);
sb_uid[i] = Draw_CreateBuffer (4, 1);
sb_name[i] = Draw_CreateBuffer (16, 1);
sb_team_frags[i] = Draw_CreateBuffer (5, 1);
[nq] Set unused fragsort entries to -1 The first scoreboard entry not showing was due to it being deleted immediately because unused fragsort array entries had a valid player index (0 in this case) and thus the unused view removal code was removing views it should not.
2022-11-08 03:49:41 +00:00
fragsort[i] = -1;
[nq] Get the deathmatch overlay working The placement isn't exactly the same as it was (more centered), but it's working and correctly appears and disappears on during bigass1.
2022-11-07 15:21:30 +00:00
}
sb_spectator = Draw_CreateBuffer (11, 1);
write_charbuff (sb_spectator, 0, 0, "(spectator)");
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
Make the hud type configurable via dirconf. Currently only "id", "hipnotic" and "rogue" are supported (anything else is treated as "id"). Has no effect in quakeworld (good thing too: changing gamedirs is a little broken).
2011-09-10 23:04:47 +00:00
if (!strcmp (qfs_gamedir->hudtype, "hipnotic")) {
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
init_hipnotic_sbar_views ();
init_hipnotic_hud_views ();
Make the hud type configurable via dirconf. Currently only "id", "hipnotic" and "rogue" are supported (anything else is treated as "id"). Has no effect in quakeworld (good thing too: changing gamedirs is a little broken).
2011-09-10 23:04:47 +00:00
} else if (!strcmp (qfs_gamedir->hudtype, "rogue")) {
get hipnotic's sbar working properly, with a hud to boot!!! :)
2003-05-09 07:27:46 +00:00
init_rogue_sbar_views ();
init_rogue_hud_views ();
stock sbar and hud seem to be working in nq (fps back, too:)
2003-05-08 21:22:33 +00:00
} else {
init_sbar_views ();
}
}
Merge draw.h.
2001-05-09 22:40:51 +00:00
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
static void
Sbar_GIB_Print_Center_f (void)
{
if (GIB_Argc () != 2) {
GIB_USAGE ("text");
} else
Sbar_CenterPrint (GIB_Argv(1));
}
[qw,nq] Clean out sbar key_dest handling I really don't remember why it mattered if key_dest was game. If it was draw layer issues, then this wasn't the correct fix anyway.
2021-11-28 15:03:53 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
static void
load_pics (void)
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
{
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 10; i++) {
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
sb_nums[0][i] = r_funcs->Draw_PicFromWad (va (0, "num_%i", i));
sb_nums[1][i] = r_funcs->Draw_PicFromWad (va (0, "anum_%i", i));
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
sb_nums[0][10] = r_funcs->Draw_PicFromWad ("num_minus");
sb_nums[1][10] = r_funcs->Draw_PicFromWad ("anum_minus");
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
sb_colon = r_funcs->Draw_PicFromWad ("num_colon");
sb_slash = r_funcs->Draw_PicFromWad ("num_slash");
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[0][0].pic = r_funcs->Draw_PicFromWad ("inv_shotgun");
sb_weapons[0][1].pic = r_funcs->Draw_PicFromWad ("inv_sshotgun");
sb_weapons[0][2].pic = r_funcs->Draw_PicFromWad ("inv_nailgun");
sb_weapons[0][3].pic = r_funcs->Draw_PicFromWad ("inv_snailgun");
sb_weapons[0][4].pic = r_funcs->Draw_PicFromWad ("inv_rlaunch");
sb_weapons[0][5].pic = r_funcs->Draw_PicFromWad ("inv_srlaunch");
sb_weapons[0][6].pic = r_funcs->Draw_PicFromWad ("inv_lightng");
sb_weapons[1][0].pic = r_funcs->Draw_PicFromWad ("inv2_shotgun");
sb_weapons[1][1].pic = r_funcs->Draw_PicFromWad ("inv2_sshotgun");
sb_weapons[1][2].pic = r_funcs->Draw_PicFromWad ("inv2_nailgun");
sb_weapons[1][3].pic = r_funcs->Draw_PicFromWad ("inv2_snailgun");
sb_weapons[1][4].pic = r_funcs->Draw_PicFromWad ("inv2_rlaunch");
sb_weapons[1][5].pic = r_funcs->Draw_PicFromWad ("inv2_srlaunch");
sb_weapons[1][6].pic = r_funcs->Draw_PicFromWad ("inv2_lightng");
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 5; i++) {
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][0].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_shotgun", i + 1));
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][1].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_sshotgun", i + 1));
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][2].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_nailgun", i + 1));
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][3].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_snailgun", i + 1));
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][4].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_rlaunch", i + 1));
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][5].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_srlaunch", i + 1));
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
sb_weapons[2 + i][6].pic =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_lightng", i + 1));
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
for (int i = 0; i < 7; i++) {
for (int j = 0; j < 8; j++) {
if (sb_weapons[i][j].pic) {
sb_weapons[i][j].w = sb_weapons[i][j].pic->width;
sb_weapons[i][j].h = sb_weapons[i][j].pic->height;
}
}
}
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
sb_ammo[0] = r_funcs->Draw_PicFromWad ("sb_shells");
sb_ammo[1] = r_funcs->Draw_PicFromWad ("sb_nails");
sb_ammo[2] = r_funcs->Draw_PicFromWad ("sb_rocket");
sb_ammo[3] = r_funcs->Draw_PicFromWad ("sb_cells");
sb_armor[0] = r_funcs->Draw_PicFromWad ("sb_armor1");
sb_armor[1] = r_funcs->Draw_PicFromWad ("sb_armor2");
sb_armor[2] = r_funcs->Draw_PicFromWad ("sb_armor3");
sb_items[0] = r_funcs->Draw_PicFromWad ("sb_key1");
sb_items[1] = r_funcs->Draw_PicFromWad ("sb_key2");
sb_items[2] = r_funcs->Draw_PicFromWad ("sb_invis");
sb_items[3] = r_funcs->Draw_PicFromWad ("sb_invuln");
sb_items[4] = r_funcs->Draw_PicFromWad ("sb_suit");
sb_items[5] = r_funcs->Draw_PicFromWad ("sb_quad");
sb_sigil[0] = r_funcs->Draw_PicFromWad ("sb_sigil1");
sb_sigil[1] = r_funcs->Draw_PicFromWad ("sb_sigil2");
sb_sigil[2] = r_funcs->Draw_PicFromWad ("sb_sigil3");
sb_sigil[3] = r_funcs->Draw_PicFromWad ("sb_sigil4");
sb_faces[4][0] = r_funcs->Draw_PicFromWad ("face1");
sb_faces[4][1] = r_funcs->Draw_PicFromWad ("face_p1");
sb_faces[3][0] = r_funcs->Draw_PicFromWad ("face2");
sb_faces[3][1] = r_funcs->Draw_PicFromWad ("face_p2");
sb_faces[2][0] = r_funcs->Draw_PicFromWad ("face3");
sb_faces[2][1] = r_funcs->Draw_PicFromWad ("face_p3");
sb_faces[1][0] = r_funcs->Draw_PicFromWad ("face4");
sb_faces[1][1] = r_funcs->Draw_PicFromWad ("face_p4");
sb_faces[0][0] = r_funcs->Draw_PicFromWad ("face5");
sb_faces[0][1] = r_funcs->Draw_PicFromWad ("face_p5");
sb_face_invis = r_funcs->Draw_PicFromWad ("face_invis");
sb_face_invuln = r_funcs->Draw_PicFromWad ("face_invul2");
sb_face_invis_invuln = r_funcs->Draw_PicFromWad ("face_inv2");
sb_face_quad = r_funcs->Draw_PicFromWad ("face_quad");
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
sb_sbar = r_funcs->Draw_PicFromWad ("sbar");
sb_ibar = r_funcs->Draw_PicFromWad ("ibar");
sb_scorebar = r_funcs->Draw_PicFromWad ("scorebar");
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
// MED 01/04/97 added new hipnotic weapons
Make the hud type configurable via dirconf. Currently only "id", "hipnotic" and "rogue" are supported (anything else is treated as "id"). Has no effect in quakeworld (good thing too: changing gamedirs is a little broken).
2011-09-10 23:04:47 +00:00
if (!strcmp (qfs_gamedir->hudtype, "hipnotic")) {
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
hsb_weapons[0][0] = r_funcs->Draw_PicFromWad ("inv_laser");
hsb_weapons[0][1] = r_funcs->Draw_PicFromWad ("inv_mjolnir");
hsb_weapons[0][2] = r_funcs->Draw_PicFromWad ("inv_gren_prox");
hsb_weapons[0][3] = r_funcs->Draw_PicFromWad ("inv_prox_gren");
hsb_weapons[0][4] = r_funcs->Draw_PicFromWad ("inv_prox");
hsb_weapons[1][0] = r_funcs->Draw_PicFromWad ("inv2_laser");
hsb_weapons[1][1] = r_funcs->Draw_PicFromWad ("inv2_mjolnir");
hsb_weapons[1][2] = r_funcs->Draw_PicFromWad ("inv2_gren_prox");
hsb_weapons[1][3] = r_funcs->Draw_PicFromWad ("inv2_prox_gren");
hsb_weapons[1][4] = r_funcs->Draw_PicFromWad ("inv2_prox");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
for (int i = 0; i < 5; i++) {
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
hsb_weapons[2 + i][0] =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_laser", i + 1));
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
hsb_weapons[2 + i][1] =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_mjolnir", i + 1));
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
hsb_weapons[2 + i][2] =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_gren_prox", i + 1));
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
hsb_weapons[2 + i][3] =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_prox_gren", i + 1));
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
hsb_weapons[2 + i][4] =
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
r_funcs->Draw_PicFromWad (va (0, "inva%i_prox", i + 1));
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
hsb_items[0] = r_funcs->Draw_PicFromWad ("sb_wsuit");
hsb_items[1] = r_funcs->Draw_PicFromWad ("sb_eshld");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
Commented out rogue/hipnotic sbar elements. Didn't outright delete them so they can be used in building the scripted HUDs for those trees. This commit removes all need for the hipnotic and rogue qbooleans.
2001-03-09 07:50:45 +00:00
// FIXME: MISSIONHUD
Make the hud type configurable via dirconf. Currently only "id", "hipnotic" and "rogue" are supported (anything else is treated as "id"). Has no effect in quakeworld (good thing too: changing gamedirs is a little broken).
2011-09-10 23:04:47 +00:00
if (!strcmp (qfs_gamedir->hudtype, "rogue")) {
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
rsb_invbar[0] = r_funcs->Draw_PicFromWad ("r_invbar1");
rsb_invbar[1] = r_funcs->Draw_PicFromWad ("r_invbar2");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
rsb_weapons[0] = r_funcs->Draw_PicFromWad ("r_lava");
rsb_weapons[1] = r_funcs->Draw_PicFromWad ("r_superlava");
rsb_weapons[2] = r_funcs->Draw_PicFromWad ("r_gren");
rsb_weapons[3] = r_funcs->Draw_PicFromWad ("r_multirock");
rsb_weapons[4] = r_funcs->Draw_PicFromWad ("r_plasma");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
rsb_items[0] = r_funcs->Draw_PicFromWad ("r_shield1");
rsb_items[1] = r_funcs->Draw_PicFromWad ("r_agrav1");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
// PGM 01/19/97 - team color border
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
rsb_teambord = r_funcs->Draw_PicFromWad ("r_teambord");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
// PGM 01/19/97 - team color border
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
rsb_ammo[0] = r_funcs->Draw_PicFromWad ("r_ammolava");
rsb_ammo[1] = r_funcs->Draw_PicFromWad ("r_ammomulti");
rsb_ammo[2] = r_funcs->Draw_PicFromWad ("r_ammoplasma");
re-enable the mission pack stuff. yeah, it's clunky, but it's nice to have. Hopefully, scripted huds will come soon.
2001-08-01 05:12:37 +00:00
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
}
re-arrange viewsize handling to fix the hud bug in glx
2003-02-11 21:24:27 +00:00
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
static void
Sbar_ShowScores (void)
{
if (sb_showscores)
return;
sb_showscores = true;
sb_updates = 0;
sbar_setcomponent (sbar_solo, hud_pic, &sb_scorebar);
sbar_setcomponent (sbar_solo_monsters, hud_charbuff, &solo_monsters);
sbar_setcomponent (sbar_solo_secrets, hud_charbuff, &solo_secrets);
sbar_setcomponent (sbar_solo_time, hud_charbuff, &solo_time);
sbar_setcomponent (sbar_solo_name, hud_charbuff, &solo_name);
draw_solo ();
View_UpdateHierarchy (sbar_solo);
}
static void
Sbar_DontShowScores (void)
{
if (!sb_showscores)
return;
sb_showscores = false;
sb_updates = 0;
sbar_remcomponent (sbar_solo, hud_pic);
sbar_remcomponent (sbar_solo_monsters, hud_charbuff);
sbar_remcomponent (sbar_solo_secrets, hud_charbuff);
sbar_remcomponent (sbar_solo_time, hud_charbuff);
sbar_remcomponent (sbar_solo_name, hud_charbuff);
}
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
static void
Sbar_ShowTeamScores (void)
{
if (sb_showteamscores)
return;
sb_showteamscores = true;
sb_updates = 0;
}
static void
Sbar_DontShowTeamScores (void)
{
sb_showteamscores = false;
sb_updates = 0;
}
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
void
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
Sbar_SetPlayers (player_info_t *players, int maxplayers)
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
{
[client] Clean up sbar's globals access I had forgotten that the cl structs in nq and qw were different layouts, which resulted in qw's sbar/hud being quite broken. Rather than messing with the structs, I decided it would be far better in the long run to clean up sbar's access to the cl struct and the few other nq/qw specific globals it used. There are still plenty of bugs to fix, but now almost everything is in the one place.
2022-11-09 03:50:05 +00:00
sbar_players = players;
sbar_maxplayers = maxplayers;
}
void
Sbar_Init (int *stats, float *item_gettime)
{
sbar_stats = stats;
sbar_item_gettime = item_gettime;
[nq] Get center print working again While the word-level text objects aren't used (because standard center print messages are already flowed as such), using a passage object makes dealing with the lines and incremental printing quite easy and efficient (everything is counted just the once or twice, not every frame).
2022-11-04 06:29:34 +00:00
center_passage.reg = hud_registry;
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
HUD_Init_Cvars ();
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
Cvar_AddListener (Cvar_FindVar ("hud_sbar"), sbar_hud_sbar_f, 0);
Cvar_AddListener (Cvar_FindVar ("hud_swap"), sbar_hud_swap_f, 0);
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
Cvar_AddListener (Cvar_FindVar ("hud_fps"), sbar_hud_fps_f, 0);
Cvar_AddListener (Cvar_FindVar ("hud_time"), sbar_hud_time_f, 0);
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
load_pics ();
init_views ();
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
[nq] Get hud_sbar working for the most part Setting the parent to another object in the same hierarchy still causes a segfault (worked around for now), but the mangled views were caused by View_UpdateHierarchy not being called prior to the first call to set_hud_sbar (why, though? I suspect something to do with oldlen). And ECS_SortComponentPool finally gets used to ensure the sbar panels are behind the info pics.
2022-11-05 18:08:50 +00:00
View_UpdateHierarchy (sbar_main);
[nq] Get most of the hud working Frags, minifrags and miniteam now work (mostly, the auto-switching between them is not working yet). Switching between hud and sbar is mostly working, except for some problems with the hierarchies corrupting themselves: setting the parent of an object to another object in the same hierarchy is just completely broken, and working with complex hierarchies seems to mess up something (things getting out of phase). I guess my unit tests were too simple. For nq, all that remains is the various overlays (death-match, intermission and finale) and rogue and hipnotic specific updates. Fortunately, other than the death-match overlay, qw is just a subset of nq for the hud (and even then, I imagine the info in qw would be nice in nq).
2022-11-05 07:41:37 +00:00
set_hud_sbar ();
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
View_UpdateHierarchy (sbar_main);
[nq] Get hud time and fps displays working This includes moving the related cvars from botn nq and qw into the client hud code. In addition, the hud code supports update and update-once function components. The update component is for updates that occur every frame, but update-once components (not used yet) are for one-shot updates (eg, when a value updates very infrequently).
2022-11-03 05:46:44 +00:00
sbar_hud_fps_f (0, 0);
sbar_hud_time_f (0, 0);
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
Cmd_AddCommand ("+showscores", Sbar_ShowScores,
"Display information on everyone playing");
Cmd_AddCommand ("-showscores", Sbar_DontShowScores,
"Stop displaying information on everyone playing");
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
Cmd_AddCommand ("+showteamscores", Sbar_ShowTeamScores,
"Display information for your team");
Cmd_AddCommand ("-showteamscores", Sbar_DontShowTeamScores,
"Stop displaying information for your team");
[nq] Get scores display working again Now only the time portion updates every frame, and then only when the scores are shown (no real change for that one). Not really a significant optimization, as the information was updated only while the scores were shown, but it's still nice.
2022-11-03 02:38:32 +00:00
[ui] Convert view_t to an ECS entity Much of the nq/qw HUD system is quite broken, but the basic status bar seems to be working nicely. As is the console (both client and server). Possibly the biggest benefit is separating the rendering of HUD elements from the updating of them, and much less traversing of invisible views whose only purpose is to control the positioning of the visible views. The view flow tests are currently disabled until I adapt the flow code to ECS. There seems to be a problem with view resizing in that some gravities don't follow resizing correctly.
2022-10-31 15:40:52 +00:00
r_data->viewsize_callback = viewsize_f;
[client] Merge sbar At long last, the status bar code is now shared between nq and qw. There are many bugs to fix, but at least now they're all in the one place.
2022-11-08 07:26:47 +00:00
Cvar_Register (&hud_scoreboard_uid_cvar, 0/*FIXME Sbar_DMO_Init_f*/, 0);
Cvar_Register (&fs_fraglog_cvar, 0, 0);
Cvar_Register (&cl_fraglog_cvar, 0, 0);
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Cvar_Register (&scr_centertime_cvar, 0, 0);
Cvar_Register (&scr_printspeed_cvar, 0, 0);
final (?) cleanup of center printing. turns out there's no reason to keep it in the renderer and every reason to pull it out (ok, some might disagree:)
2004-03-02 03:55:18 +00:00
// register GIB builtins
GIB_Builtin_Add ("print::center", Sbar_GIB_Print_Center_f);
initial checkin of most recent newtree and nuq(?) source
2001-02-19 21:15:25 +00:00
}
Reference in a new issue Copy permalink