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
|
|
|
|
|
2011-08-22 11:00:17 +00:00
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
# include <string.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRINGS_H
|
|
|
|
# include <strings.h>
|
|
|
|
#endif
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
#include <time.h>
|
|
|
|
|
2001-03-27 20:33:07 +00:00
|
|
|
#include "QF/cmd.h"
|
2011-08-22 11:00:17 +00:00
|
|
|
#include "QF/console.h"
|
2001-05-31 03:41:35 +00:00
|
|
|
#include "QF/cvar.h"
|
2001-05-09 22:40:51 +00:00
|
|
|
#include "QF/draw.h"
|
2004-03-02 03:55:18 +00:00
|
|
|
#include "QF/dstring.h"
|
|
|
|
#include "QF/gib.h"
|
2001-05-09 05:41:34 +00:00
|
|
|
#include "QF/screen.h"
|
2003-05-08 21:22:33 +00:00
|
|
|
#include "QF/sys.h"
|
2001-03-27 20:33:07 +00:00
|
|
|
#include "QF/va.h"
|
2011-08-22 11:00:17 +00:00
|
|
|
#include "QF/vid.h"
|
2001-04-15 21:11:41 +00:00
|
|
|
#include "QF/wad.h"
|
2001-05-09 05:41:34 +00:00
|
|
|
|
2012-02-13 12:58:34 +00:00
|
|
|
#include "QF/plugin/console.h"
|
2012-02-14 08:28:09 +00:00
|
|
|
#include "QF/plugin/vid_render.h"
|
2012-02-13 12:58:34 +00:00
|
|
|
|
2021-06-12 13:50:51 +00:00
|
|
|
#include "QF/ui/view.h"
|
|
|
|
|
2001-06-25 04:08:55 +00:00
|
|
|
#include "compat.h"
|
|
|
|
#include "sbar.h"
|
2020-06-21 14:15:17 +00:00
|
|
|
|
2022-02-28 03:12:51 +00:00
|
|
|
#include "client/hud.h"
|
2022-11-02 06:08:09 +00:00
|
|
|
#include "client/screen.h"
|
2022-02-28 03:12:51 +00:00
|
|
|
|
2020-06-21 14:15:17 +00:00
|
|
|
#include "nq/include/client.h"
|
|
|
|
#include "nq/include/game.h"
|
|
|
|
#include "nq/include/server.h"
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-05-14 19:46:16 +00:00
|
|
|
int sb_updates; // if >= vid.numpages, no update needed
|
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;
|
2001-02-26 06:48:02 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static view_t sbar_main;
|
|
|
|
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;
|
2022-11-03 02:38:32 +00:00
|
|
|
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;
|
2022-11-03 06:53:52 +00:00
|
|
|
static view_t sbar_tile[2];
|
|
|
|
|
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;
|
|
|
|
|
2022-11-03 06:53:52 +00:00
|
|
|
typedef struct {
|
|
|
|
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;
|
|
|
|
} view_def_t;
|
|
|
|
|
|
|
|
static view_def_t view_defs[] = {
|
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},
|
|
|
|
|
2022-11-03 06:53:52 +00:00
|
|
|
{&sbar_main, { 0, 0,320, 48}, grav_south, &cl_screen_view},
|
|
|
|
{&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},
|
|
|
|
{&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},
|
|
|
|
{&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},
|
|
|
|
{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},
|
|
|
|
{0, { 0, 0, 24, 24}, grav_northwest, &sbar_health, 4, 24, 0},
|
|
|
|
{0, {10, 0, 24, 24}, grav_northwest, &sbar_miniammo, 4, 48, 0},
|
|
|
|
|
|
|
|
{}
|
|
|
|
};
|
2022-10-31 15:40:52 +00:00
|
|
|
|
2022-11-03 05:46:44 +00:00
|
|
|
static draw_charbuffer_t *time_buff;
|
|
|
|
static draw_charbuffer_t *fps_buff;
|
|
|
|
|
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;
|
|
|
|
|
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
|
2022-11-04 02:31:11 +00:00
|
|
|
sbar_setcomponent (view_t view, uint32_t comp, const void *data)
|
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);
|
|
|
|
}
|
|
|
|
|
2001-05-14 19:46:16 +00:00
|
|
|
#define STAT_MINUS 10 // num frame for '-' stats digit
|
2011-08-22 11:00:17 +00:00
|
|
|
|
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;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-11-03 02:38:32 +00:00
|
|
|
static qpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes
|
|
|
|
static qpic_t *sb_ammo[4];
|
|
|
|
static qpic_t *sb_sigil[4];
|
|
|
|
static qpic_t *sb_armor[3];
|
|
|
|
static qpic_t *sb_items[32];
|
2001-02-19 21:15:25 +00:00
|
|
|
|
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
|
2001-05-14 19:46:16 +00:00
|
|
|
// 0 is static, 1 is temporary animation
|
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;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-11-03 02:38:32 +00:00
|
|
|
static qboolean sb_showscores;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-11-03 02:38:32 +00:00
|
|
|
static int sb_lines; // scan lines to draw
|
2001-02-19 21:15:25 +00:00
|
|
|
|
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
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
// MED 01/04/97 added two more weapons + 3
|
|
|
|
// alternates for grenade launcher
|
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
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-02-26 06:48:02 +00:00
|
|
|
// MED 01/04/97 added array to simplify
|
|
|
|
// weapon parsing
|
2022-11-03 02:38:32 +00:00
|
|
|
//static int hipweapons[4] =
|
|
|
|
// { HIT_LASER_CANNON_BIT, HIT_MJOLNIR_BIT, 4, HIT_PROXIMITY_GUN_BIT };
|
2001-08-01 05:12:37 +00:00
|
|
|
qpic_t *hsb_items[2]; // MED 01/04/97 added hipnotic items array
|
2001-02-19 21:15:25 +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
|
|
|
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 },
|
|
|
|
};
|
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)
|
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);
|
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);
|
2022-03-18 15:56:30 +00:00
|
|
|
}
|
2003-02-11 21:24:27 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static int __attribute__((used))
|
2001-02-19 21:15:25 +00:00
|
|
|
Sbar_ColorForMap (int m)
|
|
|
|
{
|
2011-08-22 11:00:17 +00:00
|
|
|
return (bound (0, m, 13) * 16) + 8;
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2009-12-19 10:54:23 +00:00
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_num (view_t *view, int num, int digits, int color)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2003-07-08 22:39:45 +00:00
|
|
|
char str[12];
|
2001-02-26 06:48:02 +00:00
|
|
|
char *ptr;
|
2022-10-31 15:40:52 +00:00
|
|
|
int l, frame, x = 0;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-07-08 22:39:45 +00:00
|
|
|
if (num > 999999999)
|
|
|
|
num = 999999999;
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
l = snprintf (str, sizeof (str), "%d", num);
|
2001-02-19 21:15:25 +00:00
|
|
|
ptr = str;
|
|
|
|
if (l > digits)
|
2001-02-26 06:48:02 +00:00
|
|
|
ptr += (l - digits);
|
2022-10-31 15:40:52 +00:00
|
|
|
while (digits > l) {
|
|
|
|
sbar_remcomponent (view[x++], hud_pic);
|
|
|
|
digits--;
|
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
while (*ptr) {
|
|
|
|
if (*ptr == '-')
|
|
|
|
frame = STAT_MINUS;
|
|
|
|
else
|
2001-02-26 06:48:02 +00:00
|
|
|
frame = *ptr - '0';
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (view[x++], hud_pic, &sb_nums[color][frame]);
|
2001-02-19 21:15:25 +00:00
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static inline void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_smallnum (view_t view, int x, int y, int n, int packed, int colored)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
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];
|
2003-05-08 21:22:33 +00:00
|
|
|
|
|
|
|
packed = packed != 0; // ensure 0 or 1
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
n = bound (-99, n, 999);
|
2003-05-08 21:22:33 +00:00
|
|
|
snprintf (num, sizeof (num), "%3d", n);
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_miniammo (view_t view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
|
|
|
int i, count;
|
|
|
|
|
2011-08-22 11:00:17 +00:00
|
|
|
// ammo counts
|
2003-05-08 21:22:33 +00:00
|
|
|
for (i = 0; i < 4; i++) {
|
2022-10-31 15:40:52 +00:00
|
|
|
view_t v = View_GetChild (view, i);
|
2003-05-08 21:22:33 +00:00
|
|
|
count = cl.stats[STAT_SHELLS + i];
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_smallnum (v, (6 * i + 1) * 8 + 2, 0, count, 0, 1);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_ammo (view_t view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
qpic_t *pic = 0;
|
|
|
|
if (cl.stats[STAT_ITEMS] & IT_SHELLS)
|
|
|
|
pic = sb_ammo[0];
|
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_NAILS)
|
|
|
|
pic = sb_ammo[1];
|
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_ROCKETS)
|
|
|
|
pic = sb_ammo[2];
|
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_CELLS)
|
|
|
|
pic = sb_ammo[3];
|
2003-05-08 21:22:33 +00:00
|
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
|
|
|
|
view_t num[3] = {
|
|
|
|
View_GetChild (view, 1),
|
|
|
|
View_GetChild (view, 2),
|
|
|
|
View_GetChild (view, 3),
|
|
|
|
};
|
|
|
|
draw_num (num, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2001-05-09 22:40:51 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static int
|
2003-05-09 07:27:46 +00:00
|
|
|
calc_flashon (float time, int mask)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
|
|
|
int flashon;
|
2001-08-01 05:12:37 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
flashon = (int) ((cl.time - time) * 10);
|
|
|
|
if (flashon < 0)
|
|
|
|
flashon = 0;
|
|
|
|
if (flashon >= 10) {
|
2003-05-09 07:27:46 +00:00
|
|
|
if (cl.stats[STAT_ACTIVEWEAPON] == mask)
|
2003-05-08 21:22:33 +00:00
|
|
|
flashon = 1;
|
|
|
|
else
|
|
|
|
flashon = 0;
|
|
|
|
} else
|
|
|
|
flashon = (flashon % 5) + 2;
|
|
|
|
return flashon;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_weapons_sbar (view_t view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
|
|
|
int flashon, i;
|
|
|
|
|
|
|
|
for (i = 0; i < 7; i++) {
|
2022-10-31 15:40:52 +00:00
|
|
|
view_t weap = View_GetChild (view, i);
|
2003-05-08 21:22:33 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN << i)) {
|
2003-05-09 07:27:46 +00:00
|
|
|
flashon = calc_flashon (cl.item_gettime[i], IT_SHOTGUN << i);
|
2003-05-08 21:22:33 +00:00
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (weap, hud_pic, &sb_weapons[flashon][i]);
|
|
|
|
} else {
|
|
|
|
sbar_remcomponent (weap, hud_pic);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_items (view_t view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
//float time;
|
|
|
|
//int flashon = 0, i;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
for (int i = 0; i < 6; i++) {
|
|
|
|
view_t item = View_GetChild (view, i);
|
2003-05-08 21:22:33 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (17 + i))) {
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
time = cl.item_gettime[17 + i];
|
2011-08-22 11:00:17 +00:00
|
|
|
if (time && time > cl.time - 2 && flashon) { // Flash frame
|
2003-05-08 21:22:33 +00:00
|
|
|
sb_updates = 0;
|
|
|
|
} else {
|
|
|
|
draw_pic (view, i * 16, 0, sb_items[i]);
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
if (time && time > cl.time - 2)
|
|
|
|
sb_updates = 0;
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
|
|
|
sbar_setcomponent (item, hud_pic, &sb_items[i]);
|
|
|
|
} else {
|
|
|
|
sbar_remcomponent (item, hud_pic);
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_sigils (view_t view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
//float time;
|
|
|
|
//int flashon = 0, i;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
for (int i = 0; i < 4; i++) {
|
|
|
|
view_t sigil = View_GetChild (view, i);
|
2003-05-08 21:22:33 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (28 + i))) {
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
time = cl.item_gettime[28 + i];
|
|
|
|
if (time && time > cl.time - 2 && flashon) { // flash frame
|
|
|
|
sb_updates = 0;
|
|
|
|
} else {
|
|
|
|
draw_pic (view, i * 8, 0, sb_sigil[i]);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
if (time && time > cl.time - 2)
|
|
|
|
sb_updates = 0;
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
|
|
|
sbar_setcomponent (sigil, hud_pic, &sb_sigil[i]);
|
|
|
|
} else {
|
|
|
|
sbar_remcomponent (sigil, hud_pic);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2022-05-04 12:03:34 +00:00
|
|
|
typedef struct {
|
|
|
|
char team[16 + 1];
|
|
|
|
int frags;
|
|
|
|
int players;
|
|
|
|
int plow, phigh, ptotal;
|
|
|
|
} team_t;
|
2011-08-22 11:00:17 +00:00
|
|
|
|
2022-05-04 12:03:34 +00:00
|
|
|
team_t teams[MAX_CLIENTS];
|
|
|
|
int teamsort[MAX_CLIENTS];
|
2011-08-22 11:00:17 +00:00
|
|
|
int fragsort[MAX_SCOREBOARD];
|
|
|
|
char scoreboardtext[MAX_SCOREBOARD][20];
|
|
|
|
int scoreboardtop[MAX_SCOREBOARD];
|
|
|
|
int scoreboardbottom[MAX_SCOREBOARD];
|
|
|
|
int scoreboardcount[MAX_SCOREBOARD];
|
2022-05-04 12:03:34 +00:00
|
|
|
int scoreboardlines, scoreboardteams;
|
2011-08-22 11:00:17 +00:00
|
|
|
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2011-08-22 11:00:17 +00:00
|
|
|
Sbar_SortFrags (void)
|
|
|
|
{
|
|
|
|
int i, j, k;
|
|
|
|
|
|
|
|
// sort by frags
|
|
|
|
scoreboardlines = 0;
|
|
|
|
for (i = 0; i < cl.maxclients; i++) {
|
2013-02-02 07:54:05 +00:00
|
|
|
if (cl.players[i].name->value[0]) {
|
2011-08-22 11:00:17 +00:00
|
|
|
fragsort[scoreboardlines] = i;
|
|
|
|
scoreboardlines++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < scoreboardlines; i++) {
|
2022-05-04 12:03:34 +00:00
|
|
|
for (j = 0; j < scoreboardlines - 1 - i; j++) {
|
2013-02-02 07:54:05 +00:00
|
|
|
if (cl.players[fragsort[j]].frags
|
|
|
|
< cl.players[fragsort[j + 1]].frags) {
|
2011-08-22 11:00:17 +00:00
|
|
|
k = fragsort[j];
|
|
|
|
fragsort[j] = fragsort[j + 1];
|
|
|
|
fragsort[j + 1] = k;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
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;
|
|
|
|
|
|
|
|
if (!cl.teamplay)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// sort the teams
|
|
|
|
memset (teams, 0, sizeof (teams));
|
|
|
|
for (i = 0; i < MAX_CLIENTS; i++)
|
|
|
|
teams[i].plow = 999;
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CLIENTS; i++) {
|
|
|
|
s = &cl.players[i];
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-08-22 11:00:17 +00:00
|
|
|
|
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;
|
|
|
|
}
|
2011-08-22 11:00:17 +00:00
|
|
|
|
2022-11-03 02:38:32 +00:00
|
|
|
static void
|
|
|
|
draw_solo_time (void)
|
|
|
|
{
|
|
|
|
int minutes = cl.time / 60;
|
|
|
|
int seconds = cl.time - 60 * minutes;
|
|
|
|
write_charbuff (solo_time, 0, 0,
|
|
|
|
va (0, "Time :%3i:%02i", minutes, seconds));
|
|
|
|
}
|
2011-08-22 11:00:17 +00:00
|
|
|
|
2022-11-03 02:38:32 +00:00
|
|
|
static void
|
|
|
|
draw_solo (void)
|
|
|
|
{
|
|
|
|
write_charbuff (solo_monsters, 0, 0,
|
|
|
|
va (0, "Monsters:%3i /%3i",
|
|
|
|
cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]));
|
|
|
|
write_charbuff (solo_secrets, 0, 0,
|
|
|
|
va (0, "Secrets :%3i /%3i",
|
|
|
|
cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]));
|
|
|
|
draw_solo_time ();
|
|
|
|
view_pos_t len = View_GetLen (sbar_solo_name);
|
|
|
|
len.x = 8 * write_charbuff (solo_name, 0, 0, cl.levelname);
|
|
|
|
View_SetLen (sbar_solo_name, len.x, len.y);
|
2011-08-22 11:00:17 +00:00
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_frags (view_t view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
int i, k, l, p = -1;
|
2001-02-26 06:48:02 +00:00
|
|
|
int top, bottom;
|
2003-05-08 21:22:33 +00:00
|
|
|
int x;
|
2013-01-31 08:18:29 +00:00
|
|
|
player_info_t *s;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-09 19:24:48 +00:00
|
|
|
if (cl.maxclients == 1)
|
|
|
|
return;
|
|
|
|
|
2001-02-19 21:15:25 +00:00
|
|
|
Sbar_SortFrags ();
|
|
|
|
|
|
|
|
// draw the text
|
|
|
|
l = scoreboardlines <= 4 ? scoreboardlines : 4;
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
x = 0;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-02-26 06:48:02 +00:00
|
|
|
for (i = 0; i < l; i++) {
|
2001-02-19 21:15:25 +00:00
|
|
|
k = fragsort[i];
|
2013-02-02 07:54:05 +00:00
|
|
|
s = &cl.players[k];
|
2022-05-04 12:03:34 +00:00
|
|
|
if (!s->name || !s->name->value[0])
|
2001-02-19 21:15:25 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// draw background
|
2012-05-26 03:04:23 +00:00
|
|
|
top = Sbar_ColorForMap (s->topcolor);
|
|
|
|
bottom = Sbar_ColorForMap (s->bottomcolor);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-09 19:24:48 +00:00
|
|
|
draw_fill (view, x + 4, 1, 28, 4, top);
|
|
|
|
draw_fill (view, x + 4, 5, 28, 3, bottom);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-07-08 22:39:45 +00:00
|
|
|
draw_smallnum (view, x + 6, 0, s->frags, 0, 0);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
if (k == cl.viewentity - 1)
|
|
|
|
p = i;
|
2011-08-22 11:00:17 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
x += 32;
|
|
|
|
}
|
|
|
|
if (p != -1) {
|
|
|
|
draw_character (view, p * 32, 0, 16);
|
|
|
|
draw_character (view, p * 32 + 26, 0, 17);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_face (view_t view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2022-11-04 00:41:23 +00:00
|
|
|
qpic_t *face;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-11-04 00:41:23 +00:00
|
|
|
if (cl.stats[STAT_HEALTH] <= 0) {//FIXME hide_Face or hide_sbar
|
|
|
|
sbar_remcomponent (sbar_face, hud_pic);
|
2001-02-19 21:15:25 +00:00
|
|
|
return;
|
|
|
|
}
|
2022-11-04 00:41:23 +00:00
|
|
|
if ((cl.stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY))
|
|
|
|
== (IT_INVISIBILITY | IT_INVULNERABILITY)) {
|
|
|
|
face = sb_face_invis_invuln;
|
|
|
|
} else if (cl.stats[STAT_ITEMS] & IT_QUAD) {
|
|
|
|
face = sb_face_quad;
|
|
|
|
} else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
|
|
|
|
face = sb_face_invis;
|
|
|
|
} else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
|
|
|
|
face = sb_face_invuln;
|
|
|
|
} else {
|
|
|
|
int f, anim;
|
|
|
|
if (cl.stats[STAT_HEALTH] >= 100) {
|
|
|
|
f = 4;
|
|
|
|
} else {
|
|
|
|
f = cl.stats[STAT_HEALTH] / 20;
|
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-11-04 00:41:23 +00:00
|
|
|
if (cl.time <= cl.faceanimtime) {
|
|
|
|
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);
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-09 16:52:41 +00:00
|
|
|
static inline void
|
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),
|
|
|
|
};
|
2001-05-15 17:22:53 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_num (num, 666, 3, 1);
|
2001-02-19 21:15:25 +00:00
|
|
|
} else {
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_num (num, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
|
2003-05-09 07:27:46 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_ARMOR3)
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (armor, hud_pic, &sb_armor[2]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (armor, hud_pic, &sb_armor[1]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_ARMOR1)
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (armor, hud_pic, &sb_armor[0]);
|
|
|
|
else
|
|
|
|
sbar_remcomponent (armor, hud_pic);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-09 16:52:41 +00:00
|
|
|
static inline void
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_health (view_t view)
|
2003-05-09 16:52:41 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
view_t num[3] = {
|
|
|
|
View_GetChild (view, 0),
|
|
|
|
View_GetChild (view, 1),
|
|
|
|
View_GetChild (view, 2),
|
|
|
|
};
|
|
|
|
draw_num (num, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 16:52:41 +00:00
|
|
|
static void
|
|
|
|
draw_status (view_t *view)
|
|
|
|
{
|
|
|
|
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0) {
|
|
|
|
draw_solo (view);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
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);
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
|
|
|
static void __attribute__((used))
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_rogue_weapons_sbar (view_t *view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 07:27:46 +00:00
|
|
|
int i;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_weapons_sbar (view);
|
|
|
|
|
|
|
|
// check for powered up weapon.
|
|
|
|
if (cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN) {
|
|
|
|
for (i = 0; i < 5; i++) {
|
|
|
|
if (cl.stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << i)) {
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_pic (view, (i + 2) * 24, 0, rsb_weapons[i]);
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_weapons_hud (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-10 02:54:17 +00:00
|
|
|
int flashon, i, j;
|
|
|
|
qpic_t *pic;
|
2003-05-09 16:52:41 +00:00
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
for (i = cl_screen_view->ylen < 204; i < 7; i++) {
|
2003-05-09 16:52:41 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN << i)) {
|
|
|
|
flashon = calc_flashon (cl.item_gettime[i], IT_SHOTGUN << i);
|
2003-05-10 02:54:17 +00:00
|
|
|
if (i >= 2) {
|
|
|
|
j = i - 2;
|
|
|
|
if (cl.stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << j))
|
|
|
|
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);
|
2003-05-09 16:52:41 +00:00
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
|
|
|
}
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_ammo_hud (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 16:52:41 +00:00
|
|
|
int i, count;
|
|
|
|
qpic_t *pic;
|
|
|
|
|
|
|
|
if (cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN)
|
|
|
|
pic = rsb_invbar[0];
|
|
|
|
else
|
|
|
|
pic = rsb_invbar[1];
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
count = cl.stats[STAT_SHELLS + i];
|
|
|
|
draw_subpic (view, 0, i * 11, pic, 3 + (i * 48), 0, 42, 11);
|
|
|
|
draw_smallnum (view, 7, i * 11, count, 0, 1);
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_items (view_t *view)
|
2003-05-09 07:27:46 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 07:27:46 +00:00
|
|
|
int i;
|
|
|
|
float time;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_items (view);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (29 + i))) {
|
|
|
|
time = cl.item_gettime[29 + i];
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_pic (view, 96 + i * 16, 0, rsb_items[i]);
|
2003-05-09 07:27:46 +00:00
|
|
|
if (time && time > (cl.time - 2))
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_rogue_inventory_sbar (view_t *view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 07:27:46 +00:00
|
|
|
if (cl.stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN)
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_pic (view, 0, 0, rsb_invbar[0]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_pic (view, 0, 0, rsb_invbar[1]);
|
|
|
|
|
|
|
|
view_draw (view);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_face (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 16:52:41 +00:00
|
|
|
int top, bottom;
|
2013-01-31 08:18:29 +00:00
|
|
|
player_info_t *s;
|
2003-05-09 16:52:41 +00:00
|
|
|
|
|
|
|
// PGM 01/19/97 - team color drawing
|
|
|
|
|
2013-02-02 07:54:05 +00:00
|
|
|
s = &cl.players[cl.viewentity - 1];
|
2003-05-09 16:52:41 +00:00
|
|
|
|
2012-05-26 03:04:23 +00:00
|
|
|
top = Sbar_ColorForMap (s->topcolor);
|
|
|
|
bottom = Sbar_ColorForMap (s->bottomcolor);
|
2003-05-09 07:27:46 +00:00
|
|
|
|
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);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_status (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 16:52:41 +00:00
|
|
|
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0) {
|
|
|
|
draw_solo (view);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2003-05-10 02:54:17 +00:00
|
|
|
draw_num (view, 24, 0, cl.stats[STAT_ARMOR], 3,
|
|
|
|
cl.stats[STAT_ARMOR] <= 25);
|
|
|
|
if (cl.stats[STAT_ITEMS] & RIT_ARMOR3)
|
|
|
|
draw_pic (view, 0, 0, sb_armor[2]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_ARMOR2)
|
|
|
|
draw_pic (view, 0, 0, sb_armor[1]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_ARMOR1)
|
|
|
|
draw_pic (view, 0, 0, sb_armor[0]);
|
|
|
|
|
2010-01-13 06:42:26 +00:00
|
|
|
// PGM 03/02/97 - fixed so color swatch appears in only CTF modes
|
[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 (cl.maxclients != 1 && teamplay > 3 && teamplay < 7)
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_face (view);
|
|
|
|
else
|
|
|
|
draw_face (view);
|
2003-05-10 02:54:17 +00:00
|
|
|
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_health (view);
|
2003-05-10 02:54:17 +00:00
|
|
|
|
|
|
|
if (cl.stats[STAT_ITEMS] & RIT_SHELLS)
|
|
|
|
draw_pic (view, 224, 0, sb_ammo[0]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_NAILS)
|
|
|
|
draw_pic (view, 224, 0, sb_ammo[1]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_ROCKETS)
|
|
|
|
draw_pic (view, 224, 0, sb_ammo[2]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_CELLS)
|
|
|
|
draw_pic (view, 224, 0, sb_ammo[3]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_LAVA_NAILS)
|
|
|
|
draw_pic (view, 224, 0, rsb_ammo[0]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_PLASMA_AMMO)
|
|
|
|
draw_pic (view, 224, 0, rsb_ammo[1]);
|
|
|
|
else if (cl.stats[STAT_ITEMS] & RIT_MULTI_ROCKETS)
|
|
|
|
draw_pic (view, 224, 0, rsb_ammo[2]);
|
|
|
|
draw_num (view, 248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_hipnotic_weapons_sbar (view_t *view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
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;
|
2003-05-09 07:27:46 +00:00
|
|
|
|
2003-05-11 05:20:41 +00:00
|
|
|
for (i = 0; i < 10; i++) {
|
|
|
|
if (i < 7) {
|
|
|
|
mask = IT_SHOTGUN << i;
|
|
|
|
time = cl.item_gettime[i];
|
|
|
|
} else {
|
|
|
|
mask = 1 << hipweapons[h[i - 7]];
|
|
|
|
time = cl.item_gettime[hipweapons[h[i - 7]]];
|
|
|
|
}
|
|
|
|
if (cl.stats[STAT_ITEMS] & mask) {
|
|
|
|
flashon = calc_flashon (time, mask);
|
2003-05-09 07:27:46 +00:00
|
|
|
|
2003-05-11 05:20:41 +00:00
|
|
|
if (i == 4 && cl.stats[STAT_ACTIVEWEAPON] == (1 << hipweapons[3]))
|
|
|
|
continue;
|
|
|
|
if (i == 9 && cl.stats[STAT_ACTIVEWEAPON] != (1 << hipweapons[3]))
|
|
|
|
continue;
|
|
|
|
if (i < 7) {
|
|
|
|
pic = sb_weapons[flashon][i];
|
|
|
|
} else {
|
|
|
|
pic = hsb_weapons[flashon][h[i - 7]];
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
2003-05-11 05:20:41 +00:00
|
|
|
|
|
|
|
draw_subpic (view, x[i], 0, pic, 0, 0, 24, 16);
|
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_hipnotic_weapons_hud (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
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};
|
2003-05-09 07:27:46 +00:00
|
|
|
qpic_t *pic;
|
|
|
|
int mask;
|
|
|
|
float time;
|
|
|
|
|
2003-05-11 04:51:14 +00:00
|
|
|
for (i = 0; i < 10; i++) {
|
2003-05-09 07:27:46 +00:00
|
|
|
if (i < 7) {
|
2003-05-11 04:51:14 +00:00
|
|
|
mask = IT_SHOTGUN << i;
|
2003-05-09 07:27:46 +00:00
|
|
|
time = cl.item_gettime[i];
|
|
|
|
} else {
|
2003-05-11 04:51:14 +00:00
|
|
|
mask = 1 << hipweapons[h[i - 7]];
|
|
|
|
time = cl.item_gettime[hipweapons[h[i - 7]]];
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
if (cl.stats[STAT_ITEMS] & mask) {
|
|
|
|
flashon = calc_flashon (time, mask);
|
|
|
|
|
|
|
|
if (i < 7) {
|
|
|
|
pic = sb_weapons[flashon][i];
|
|
|
|
} else {
|
2003-05-11 04:51:14 +00:00
|
|
|
pic = hsb_weapons[flashon][h[i - 7]];
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2003-05-11 04:51:14 +00:00
|
|
|
draw_subpic (view, 0, y[i], pic, 0, 0, 24, 16);
|
2003-05-09 07:27:46 +00:00
|
|
|
|
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
|
|
|
}
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_hipnotic_items (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 07:27:46 +00:00
|
|
|
int i;
|
|
|
|
float time;
|
|
|
|
|
|
|
|
// items
|
|
|
|
for (i = 2; i < 6; i++) {
|
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (17 + i))) {
|
|
|
|
time = cl.item_gettime[17 + i];
|
|
|
|
draw_pic (view, 192 + i * 16, 0, sb_items[i]);
|
|
|
|
if (time && time > cl.time - 2)
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// hipnotic items
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (24 + i))) {
|
|
|
|
time = cl.item_gettime[24 + i];
|
|
|
|
draw_pic (view, 288 + i * 16, 0, hsb_items[i]);
|
|
|
|
if (time && time > (cl.time - 2))
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_hipnotic_inventory_sbar (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_pic (view, 0, 0, sb_ibar);
|
|
|
|
view_draw (view);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void __attribute__((used))
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_hipnotic_status (view_t *view)
|
2003-05-09 07:27:46 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-09 16:52:41 +00:00
|
|
|
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0) {
|
|
|
|
draw_solo (view);
|
|
|
|
return;
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_armor (view);
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_face (view);
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_health (view);
|
|
|
|
draw_ammo (view);
|
2003-05-09 07:27:46 +00:00
|
|
|
|
|
|
|
if (cl.stats[STAT_ITEMS] & IT_KEY1)
|
|
|
|
draw_pic (view, 209, 3, sb_items[0]);
|
|
|
|
if (cl.stats[STAT_ITEMS] & IT_KEY2)
|
|
|
|
draw_pic (view, 209, 12, sb_items[1]);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2013-01-13 11:08:01 +00:00
|
|
|
static void
|
|
|
|
sbar_update_vis (void)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
qboolean headsup;
|
|
|
|
|
2013-01-13 08:10:11 +00:00
|
|
|
if (r_data->scr_copyeverything)
|
|
|
|
Sbar_Changed ();
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
sbar_view->visible = 0;
|
2001-02-19 21:15:25 +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
|
|
|
headsup = !(hud_sbar || sb_view_size < 100);
|
2001-02-26 06:48:02 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
if ((sb_updates >= r_data->vid->numpages) && !headsup)
|
2001-02-19 21:15:25 +00:00
|
|
|
return;
|
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
if (con_module &&
|
2022-09-21 08:31:18 +00:00
|
|
|
con_module->data->console->lines == cl_screen_view->ylen)
|
2001-02-26 06:48:02 +00:00
|
|
|
return; // console is full screen
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
if (cls.state == ca_active
|
|
|
|
&& ((cl.stats[STAT_HEALTH] <= 0) || sb_showscores))
|
[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_overlay_view->visible = 1;
|
2003-05-08 21:22:33 +00:00
|
|
|
else
|
[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_overlay_view->visible = 0;
|
2001-05-09 22:40:51 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
if (!sb_lines)
|
|
|
|
return;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
sbar_view->visible = 1;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
r_data->scr_copyeverything = 1;
|
2003-05-08 21:22:33 +00:00
|
|
|
sb_updates++;
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
|
|
|
Sbar_DeathmatchOverlay (view_t *view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2001-02-26 06:48:02 +00:00
|
|
|
int i, k, l;
|
|
|
|
int top, bottom;
|
2003-07-08 22:39:45 +00:00
|
|
|
int x, y;
|
2013-01-31 08:18:29 +00:00
|
|
|
player_info_t *s;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
r_data->scr_copyeverything = 1;
|
|
|
|
r_data->scr_fullupdate = 0;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_cachepic (view, 0, 0, "gfx/ranking.lmp", 1);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
// scores
|
|
|
|
Sbar_SortFrags ();
|
|
|
|
|
|
|
|
// draw the text
|
|
|
|
l = scoreboardlines;
|
|
|
|
|
2001-03-04 07:43:27 +00:00
|
|
|
x = 80;
|
2001-02-19 21:15:25 +00:00
|
|
|
y = 40;
|
|
|
|
for (i = 0; i < l; i++) {
|
|
|
|
k = fragsort[i];
|
2013-02-02 07:54:05 +00:00
|
|
|
s = &cl.players[k];
|
2012-05-26 03:53:03 +00:00
|
|
|
if (!s->name->value[0])
|
2001-02-19 21:15:25 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// draw background
|
2012-05-26 03:04:23 +00:00
|
|
|
top = Sbar_ColorForMap (s->topcolor);
|
|
|
|
bottom = Sbar_ColorForMap (s->bottomcolor);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_fill (view, x, y, 40, 4, top);
|
|
|
|
draw_fill (view, x, y + 4, 40, 4, bottom);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-07-08 22:39:45 +00:00
|
|
|
draw_smallnum (view, x + 12, y, s->frags, 0, 0);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
if (k == cl.viewentity - 1)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_character (view, x - 4, y, 12);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
// draw name
|
2012-05-26 03:53:03 +00:00
|
|
|
draw_string (view, x + 64, y, s->name->value);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
y += 10;
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:53:41 +00:00
|
|
|
static void
|
|
|
|
Sbar_DrawScoreboard (void)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
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);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-11-21 04:53:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_overlay (view_t *view)
|
|
|
|
{
|
|
|
|
if (sb_showscores || cl.stats[STAT_HEALTH] <= 0) {
|
|
|
|
Sbar_DrawScoreboard ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
|
|
|
draw_time (view_t *view)
|
|
|
|
{
|
2021-03-29 08:27:06 +00:00
|
|
|
struct tm *local = 0;
|
2003-05-08 21:22:33 +00:00
|
|
|
time_t utc = 0;
|
2003-07-08 20:11:10 +00:00
|
|
|
char st[80]; //FIXME: overflow
|
2003-05-08 21:22:33 +00:00
|
|
|
|
|
|
|
// Get local time
|
2021-03-29 08:27:06 +00:00
|
|
|
utc = time (0);
|
2003-05-08 21:22:33 +00:00
|
|
|
local = localtime (&utc);
|
|
|
|
|
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
|
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
|
2021-03-30 08:38:42 +00:00
|
|
|
strftime (st, sizeof (st), HOUR12":%M "PM, local);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-11-03 05:46:44 +00:00
|
|
|
write_charbuff (time_buff, 0, 0, st);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2022-11-03 05:46:44 +00:00
|
|
|
draw_fps (view_t view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2011-08-22 11:00:17 +00:00
|
|
|
static char st[80];
|
2003-05-08 21:22:33 +00:00
|
|
|
double t;
|
|
|
|
static double lastframetime;
|
2003-07-27 22:25:45 +00:00
|
|
|
static double lastfps;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
|
|
|
t = Sys_DoubleTime ();
|
2003-07-27 22:25:45 +00:00
|
|
|
if ((t - lastframetime) >= 0.2) {
|
|
|
|
lastfps = fps_count / (t - lastframetime);
|
2003-05-08 21:22:33 +00:00
|
|
|
fps_count = 0;
|
|
|
|
lastframetime = t;
|
2022-11-03 05:46:44 +00:00
|
|
|
int prec = lastfps < 1000 ? 1 : 0;
|
|
|
|
snprintf (st, sizeof (st), "%5.*f FPS", prec, lastfps);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-11-03 05:46:44 +00:00
|
|
|
write_charbuff (fps_buff, 0, 0, st);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2022-11-03 08:49:05 +00:00
|
|
|
draw_intermission (view_t view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
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),
|
|
|
|
};
|
|
|
|
int dig = cl.completed_time / 60;
|
|
|
|
int num = cl.completed_time - dig * 60;
|
|
|
|
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),
|
|
|
|
};
|
|
|
|
draw_num (secr_views + 0, cl.stats[STAT_SECRETS], 3, 0);
|
|
|
|
sbar_setcomponent (secr_views[3], hud_pic, &sb_slash);
|
|
|
|
draw_num (secr_views + 4, cl.stats[STAT_TOTALSECRETS], 3, 0);
|
|
|
|
|
|
|
|
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),
|
|
|
|
};
|
|
|
|
draw_num (kill_views + 0, cl.stats[STAT_MONSTERS], 3, 0);
|
|
|
|
sbar_setcomponent (kill_views[3], hud_pic, &sb_slash);
|
|
|
|
draw_num (kill_views + 4, cl.stats[STAT_TOTALMONSTERS], 3, 0);
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-11-03 08:49:05 +00:00
|
|
|
for (uint32_t i = 0; i < View_ChildCount (view); i++) {
|
|
|
|
clear_views (View_GetChild (view, i));
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-11-03 08:49:05 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
void
|
|
|
|
Sbar_IntermissionOverlay (void)
|
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_data->scr_copyeverything = 1;
|
|
|
|
r_data->scr_fullupdate = 0;
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
return;
|
|
|
|
}
|
2022-11-03 08:49:05 +00:00
|
|
|
draw_intermission (intermission_view);
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2022-11-03 08:49:05 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
Sbar_Intermission (int mode)
|
|
|
|
{
|
|
|
|
void *f = clear_views;
|
|
|
|
if (mode == 1) {
|
|
|
|
f = draw_intermission;
|
|
|
|
}
|
|
|
|
sbar_setcomponent (intermission_view, hud_updateonce, &f);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2004-03-02 03:55:18 +00:00
|
|
|
/* CENTER PRINTING */
|
|
|
|
static dstring_t center_string = {&dstring_default_mem};
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
if (!str) {
|
|
|
|
centertime_off = 0;
|
|
|
|
dstring_clearstr (¢er_string);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dstring_copystr (¢er_string, str);
|
|
|
|
|
[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;
|
2004-03-02 03:55:18 +00:00
|
|
|
centertime_start = realtime;
|
|
|
|
|
|
|
|
// count the number of lines for centering
|
|
|
|
center_lines = 1;
|
|
|
|
while (*str) {
|
|
|
|
if (*str == '\n')
|
|
|
|
center_lines++;
|
|
|
|
str++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2022-10-31 15:40:52 +00:00
|
|
|
Sbar_DrawCenterString (view_t view, int remaining)
|
2004-03-02 03:55:18 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2004-03-02 03:55:18 +00:00
|
|
|
const char *start;
|
|
|
|
int j, l, x, y;
|
|
|
|
|
|
|
|
start = center_string.str;
|
|
|
|
|
|
|
|
if (center_lines <= 4)
|
|
|
|
y = view->yabs + view->ylen * 0.35;
|
|
|
|
else
|
|
|
|
y = view->yabs + 48;
|
|
|
|
|
|
|
|
do {
|
|
|
|
// scan the width of the line
|
|
|
|
for (l = 0; l < 40; l++)
|
|
|
|
if (start[l] == '\n' || !start[l])
|
|
|
|
break;
|
|
|
|
x = view->xabs + (view->xlen - l * 8) / 2;
|
|
|
|
for (j = 0; j < l; j++, x += 8) {
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_Character (x, y, start[j]);
|
2004-03-02 03:55:18 +00:00
|
|
|
if (!remaining--)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
y += 8;
|
|
|
|
|
|
|
|
while (*start && *start != '\n')
|
|
|
|
start++;
|
|
|
|
if (!*start)
|
|
|
|
break;
|
|
|
|
start++; // skip the \n
|
|
|
|
} while (1);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2004-03-02 03:55:18 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
Sbar_FinaleOverlay (void)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2004-03-02 00:58:13 +00:00
|
|
|
int remaining;
|
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
r_data->scr_copyeverything = 1;
|
2001-02-19 21:15:25 +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
|
|
|
draw_cachepic (hud_overlay_view, 0, 16, "gfx/finale.lmp", 1);
|
2004-03-02 00:58:13 +00:00
|
|
|
// the finale prints the characters one at a time
|
[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
|
|
|
remaining = scr_printspeed * (realtime - centertime_start);
|
|
|
|
Sbar_DrawCenterString (hud_overlay_view, remaining);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2004-03-01 23:47:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Sbar_DrawCenterPrint (void)
|
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_data->scr_copytop = 1;
|
2004-03-02 00:58:13 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
centertime_off -= r_data->frametime;
|
2004-03-02 03:55:18 +00:00
|
|
|
if (centertime_off <= 0)
|
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);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2022-05-04 12:03:34 +00:00
|
|
|
/*
|
|
|
|
draw_minifrags
|
|
|
|
|
|
|
|
frags name
|
|
|
|
frags team name
|
|
|
|
displayed to right of status bar if there's room
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
draw_minifrags (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2022-05-04 12:03:34 +00:00
|
|
|
int numlines, top, bottom, f, i, k, x, y;
|
|
|
|
char num[20];
|
|
|
|
player_info_t *s;
|
|
|
|
|
|
|
|
r_data->scr_copyeverything = 1;
|
|
|
|
r_data->scr_fullupdate = 0;
|
|
|
|
|
|
|
|
// scores
|
|
|
|
Sbar_SortFrags ();
|
|
|
|
|
|
|
|
if (!scoreboardlines)
|
|
|
|
return; // no one there?
|
|
|
|
|
|
|
|
numlines = view->ylen / 8;
|
|
|
|
if (numlines < 3)
|
|
|
|
return; // not enough room
|
|
|
|
|
|
|
|
// find us
|
|
|
|
for (i = 0; i < scoreboardlines; i++)
|
|
|
|
if (fragsort[i] == cl.playernum)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (i == scoreboardlines) // we're not there, we are probably a
|
|
|
|
// spectator, just display top
|
|
|
|
i = 0;
|
|
|
|
else // figure out start
|
|
|
|
i = i - numlines / 2;
|
|
|
|
|
|
|
|
if (i > scoreboardlines - numlines)
|
|
|
|
i = scoreboardlines - numlines;
|
|
|
|
if (i < 0)
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
x = 4;
|
|
|
|
y = 0;
|
|
|
|
|
|
|
|
for (; i < scoreboardlines && y < view->ylen - 8 + 1; i++) {
|
|
|
|
k = fragsort[i];
|
|
|
|
s = &cl.players[k];
|
|
|
|
if (!s->name || !s->name->value[0])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// draw ping
|
|
|
|
top = s->topcolor;
|
|
|
|
bottom = s->bottomcolor;
|
|
|
|
top = Sbar_ColorForMap (top);
|
|
|
|
bottom = Sbar_ColorForMap (bottom);
|
|
|
|
|
|
|
|
draw_fill (view, x + 2, y + 1, 37, 3, top);
|
|
|
|
draw_fill (view, x + 2, y + 4, 37, 4, bottom);
|
|
|
|
|
|
|
|
// draw number
|
|
|
|
f = s->frags;
|
|
|
|
if (k != cl.playernum) {
|
|
|
|
snprintf (num, sizeof (num), " %3i ", f);
|
|
|
|
} else {
|
|
|
|
snprintf (num, sizeof (num), "\x10%3i\x11", f);
|
|
|
|
}
|
|
|
|
|
|
|
|
draw_nstring (view, x, y, num, 5);
|
|
|
|
|
|
|
|
// team
|
|
|
|
if (cl.teamplay) {
|
|
|
|
draw_nstring (view, x + 48, y, s->team->value, 4);
|
|
|
|
draw_nstring (view, x + 48 + 40, y, s->name->value, 16);
|
|
|
|
} else
|
|
|
|
draw_nstring (view, x + 48, y, s->name->value, 16);
|
|
|
|
y += 8;
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2022-05-04 12:03:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_miniteam (view_t *view)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2022-05-04 12:03:34 +00:00
|
|
|
int i, k, x, y;
|
|
|
|
char num[12];
|
|
|
|
info_key_t *player_team = cl.players[cl.playernum].team;
|
|
|
|
team_t *tm;
|
|
|
|
|
|
|
|
if (!cl.teamplay)
|
|
|
|
return;
|
|
|
|
Sbar_SortTeams ();
|
|
|
|
|
|
|
|
x = 0;
|
|
|
|
y = 0;
|
|
|
|
for (i = 0; i < scoreboardteams && y <= view->ylen; i++) {
|
|
|
|
k = teamsort[i];
|
|
|
|
tm = teams + k;
|
|
|
|
|
|
|
|
// draw pings
|
|
|
|
draw_nstring (view, x, y, tm->team, 4);
|
|
|
|
// draw total
|
|
|
|
snprintf (num, sizeof (num), "%5i", tm->frags);
|
|
|
|
draw_string (view, x + 40, y, num);
|
|
|
|
|
|
|
|
if (player_team && strnequal (player_team->value, tm->team, 16)) {
|
|
|
|
draw_character (view, x - 8, y, 16);
|
|
|
|
draw_character (view, x + 32, y, 17);
|
|
|
|
}
|
|
|
|
|
|
|
|
y += 8;
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2022-05-04 12:03:34 +00:00
|
|
|
}
|
|
|
|
|
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},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
static const sb_updater_t health_update[] = {
|
|
|
|
{draw_health, &sbar_health},
|
|
|
|
{draw_face, &sbar_face},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
static const sb_updater_t info_update[] = {
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
static const sb_updater_t items_update[] = {
|
|
|
|
{draw_items, &sbar_items},
|
|
|
|
{draw_sigils, &sbar_sigils},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
static const sb_updater_t weapon_update[] = {
|
|
|
|
{draw_weapons_sbar, &sbar_weapons},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
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];
|
|
|
|
while (ud->update) {
|
|
|
|
sbar_setcomponent (*ud->view, hud_updateonce, &ud->update);
|
|
|
|
ud++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
void
|
|
|
|
Sbar_Draw (void)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
if (cls.state != ca_active) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (sb_update_flags & (1 << sbc_info)) {
|
|
|
|
draw_miniteam (0);
|
|
|
|
draw_minifrags (0);
|
|
|
|
draw_overlay (0);
|
|
|
|
Sbar_DeathmatchOverlay (0);
|
|
|
|
sbar_update_vis ();
|
|
|
|
}
|
2022-11-03 02:38:32 +00:00
|
|
|
if (sb_showscores) {
|
|
|
|
draw_solo_time ();
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
|
|
|
sbar_update_vis ();
|
|
|
|
hud_main_view->draw (hud_main_view);
|
|
|
|
#endif
|
|
|
|
sb_update_flags = 0;
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void
|
|
|
|
sbar_hud_swap_f (void *data, const cvar_t *cvar)
|
|
|
|
{
|
|
|
|
if (hud_sbar) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void
|
|
|
|
sbar_hud_sbar_f (void *data, const cvar_t *cvar)
|
|
|
|
{
|
|
|
|
view_t v;
|
|
|
|
if (hud_swap) {
|
|
|
|
View_SetParent (sbar_armament, hud_view);
|
|
|
|
View_SetPos (sbar_armament, 0, 48);
|
|
|
|
View_SetLen (sbar_armament, 42, 156);
|
|
|
|
View_SetGravity (sbar_armament,
|
|
|
|
hud_swap ? grav_southwest : grav_southeast);
|
|
|
|
|
|
|
|
View_SetLen (sbar_weapons, 24, 112);
|
|
|
|
View_SetGravity (sbar_weapons,
|
|
|
|
hud_swap ? grav_northwest : grav_northeast);
|
|
|
|
|
|
|
|
View_SetLen (sbar_miniammo, 42, 44);
|
|
|
|
View_SetGravity (sbar_weapons, grav_southeast);
|
|
|
|
|
|
|
|
for (int i = 0; i < 7; i++) {
|
|
|
|
v = View_GetChild (sbar_weapons, i);
|
|
|
|
View_SetPos (v, 0, i * 16);
|
|
|
|
View_SetLen (v, 24, 16);
|
|
|
|
if (sbar_hascomponent (v, hud_subpic)) {
|
|
|
|
hud_subpic_t subpic = {
|
|
|
|
sbar_getcomponent (v, hud_pic), 0, 0, 24, 16
|
|
|
|
};
|
|
|
|
sbar_setcomponent (v, hud_subpic, &subpic);
|
|
|
|
sbar_remcomponent (v, hud_pic);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
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, 32, 192);
|
|
|
|
View_SetGravity (sbar_weapons, grav_southwest);
|
|
|
|
|
|
|
|
View_SetLen (sbar_miniammo, 42, 44);
|
|
|
|
View_SetGravity (sbar_weapons, grav_southeast);
|
|
|
|
|
|
|
|
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);
|
|
|
|
sbar_setcomponent (v, hud_pic, &subpic->pic);
|
|
|
|
sbar_remcomponent (v, hud_subpic);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void
|
|
|
|
init_sbar_views (void)
|
|
|
|
{
|
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];
|
|
|
|
view_t parent = def->parent ? *def->parent : nullview;
|
|
|
|
int x = def->rect.x;
|
|
|
|
int y = def->rect.y;
|
|
|
|
int w = def->rect.w;
|
|
|
|
int h = def->rect.h;
|
|
|
|
if (def->view) {
|
|
|
|
*def->view = sbar_view (x, y, w, h, def->gravity, parent);
|
|
|
|
} else {
|
|
|
|
for (int j = 0; j < def->count; j++) {
|
|
|
|
sbar_view (x, y, w, h, def->gravity, parent);
|
|
|
|
x += def->xstep;
|
|
|
|
y += def->ystep;
|
|
|
|
}
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
}
|
|
|
|
for (int i = 0; i < 4; i++) {
|
2022-11-03 06:53:52 +00:00
|
|
|
view_t v = View_GetChild (sbar_miniammo, i);
|
2022-10-31 15:40:52 +00:00
|
|
|
draw_charbuffer_t *buffer = Draw_CreateBuffer (3, 1);
|
2022-11-03 08:49:05 +00:00
|
|
|
Draw_ClearBuffer (buffer);
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (v, hud_charbuff, &buffer);
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
sbar_setcomponent (sbar_inventory, hud_pic, &sb_ibar);
|
|
|
|
sbar_setcomponent (sbar_statusbar, hud_pic, &sb_sbar);
|
|
|
|
|
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_hud_views (void)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
view_t *view;
|
2022-05-04 12:03:34 +00:00
|
|
|
view_t *minifrags_view = 0;
|
|
|
|
view_t *miniteam_view = 0;
|
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
if (cl_screen_view->xlen < 512) {
|
2022-05-04 12:03:34 +00:00
|
|
|
hud_view = view_new (0, 0, 320, 48, grav_south);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-05-04 12:03:34 +00:00
|
|
|
hud_frags_view = view_new (0, 0, 130, 8, grav_northeast);
|
|
|
|
hud_frags_view->draw = draw_frags;
|
2022-09-21 08:31:18 +00:00
|
|
|
} else if (cl_screen_view->xlen < 640) {
|
2022-05-04 12:03:34 +00:00
|
|
|
hud_view = view_new (0, 0, 512, 48, grav_south);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-05-04 12:03:34 +00:00
|
|
|
minifrags_view = view_new (320, 0, 192, 48, grav_southwest);
|
|
|
|
minifrags_view->draw = draw_minifrags;
|
|
|
|
minifrags_view->resize_y = 1;
|
|
|
|
} else {
|
|
|
|
hud_view = view_new (0, 0, 640, 48, grav_south);
|
|
|
|
|
|
|
|
minifrags_view = view_new (320, 0, 192, 48, grav_southwest);
|
|
|
|
minifrags_view->draw = draw_minifrags;
|
|
|
|
minifrags_view->resize_y = 1;
|
|
|
|
|
|
|
|
miniteam_view = view_new (0, 0, 96, 48, grav_southeast);
|
|
|
|
miniteam_view->draw = draw_miniteam;
|
|
|
|
miniteam_view->resize_y = 1;
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
hud_view->resize_y = 1;
|
|
|
|
|
|
|
|
hud_armament_view = view_new (0, 48, 42, 156, grav_southeast);
|
|
|
|
|
2022-05-04 12:03:34 +00:00
|
|
|
view = view_new (0, 0, 42, 112, grav_northeast);
|
2003-05-08 21:22:33 +00:00
|
|
|
view->draw = draw_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_status;
|
|
|
|
view_add (hud_view, view);
|
|
|
|
|
|
|
|
view = view_new (32, 0, 96, 16, grav_southeast);
|
|
|
|
view->draw = draw_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);
|
|
|
|
|
2022-05-12 11:15:19 +00:00
|
|
|
if (minifrags_view)
|
|
|
|
view_add (hud_view, minifrags_view);
|
|
|
|
if (miniteam_view)
|
|
|
|
view_add (hud_view, miniteam_view);
|
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
view = view_new (0, 0, cl_screen_view->xlen, 48, grav_south);
|
2022-09-21 16:40:30 +00:00
|
|
|
view->resize_x = 1;
|
2003-05-08 21:22:33 +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);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-05-09 07:27:46 +00:00
|
|
|
init_hipnotic_sbar_views (void)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
view_t *view;
|
|
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
|
|
|
view = view_new (0, 0, 320, 24, grav_southwest);
|
|
|
|
view->draw = draw_hipnotic_status;
|
2003-05-09 07:27:46 +00:00
|
|
|
view_add (sbar_view, view);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
if (cl_screen_view->xlen > 320) {
|
|
|
|
int l = (cl_screen_view->xlen - 320) / 2;
|
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);
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_hipnotic_hud_views (void)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
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;
|
|
|
|
|
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),
|
2003-05-09 19:24:48 +00:00
|
|
|
66, 160, grav_southeast);
|
|
|
|
} else {
|
|
|
|
hud_armament_view = view_new (0, 48, 42, 204, grav_southeast);
|
|
|
|
}
|
2003-05-09 07:27:46 +00:00
|
|
|
|
2003-05-09 19:24:48 +00:00
|
|
|
view = view_new (0, 0, 24, 160, grav_northeast);
|
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;
|
2003-05-08 21:22:33 +00:00
|
|
|
view_add (hud_view, view);
|
|
|
|
|
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);
|
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
view = view_new (0, 0, cl_screen_view->xlen, 48, grav_south);
|
2022-09-21 16:40:30 +00:00
|
|
|
view->resize_x = 1;
|
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);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-05-09 07:27:46 +00:00
|
|
|
init_rogue_sbar_views (void)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
view_t *view;
|
|
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
|
|
|
view = view_new (0, 0, 320, 24, grav_southwest);
|
|
|
|
view->draw = draw_rogue_status;
|
2003-05-09 16:52:41 +00:00
|
|
|
view_add (sbar_view, view);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
if (cl_screen_view->xlen > 320) {
|
|
|
|
int l = (cl_screen_view->xlen - 320) / 2;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
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);
|
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
static void
|
|
|
|
init_rogue_hud_views (void)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
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;
|
|
|
|
|
2003-05-10 02:54:17 +00:00
|
|
|
hud_armament_view = view_new (0, 48, 42, 156, grav_southeast);
|
2003-05-09 16:52:41 +00:00
|
|
|
|
2003-05-10 02:54:17 +00:00
|
|
|
view = view_new (0, 0, 24, 112, grav_northeast);
|
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);
|
|
|
|
|
2022-09-21 08:31:18 +00:00
|
|
|
view = view_new (0, 0, cl_screen_view->xlen, 48, grav_south);
|
2022-09-21 16:40:30 +00:00
|
|
|
view->resize_x = 1;
|
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);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
|
|
|
init_views (void)
|
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
#if 0
|
2022-09-21 08:31:18 +00:00
|
|
|
hud_main_view = view_new (0, 0, cl_screen_view->xlen, cl_screen_view->ylen,
|
|
|
|
grav_northwest);
|
|
|
|
view_insert (cl_screen_view, hud_main_view, 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
|
|
|
hud_main_view->resize_x = 1; // get resized if the 2d view resizes
|
|
|
|
hud_main_view->resize_y = 1;
|
|
|
|
hud_main_view->visible = 0; // but don't let the console draw our stuff
|
2022-09-21 08:31:18 +00:00
|
|
|
if (cl_screen_view->ylen > 300)
|
[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_overlay_view = view_new (0, 0, 320, 300, grav_center);
|
2003-05-08 21:22:33 +00:00
|
|
|
else
|
2022-09-21 08:31:18 +00:00
|
|
|
hud_overlay_view = view_new (0, 0, 320, cl_screen_view->ylen,
|
|
|
|
grav_center);
|
[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_overlay_view->draw = draw_overlay;
|
|
|
|
hud_overlay_view->visible = 0;
|
2003-05-08 21:22:33 +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
|
|
|
hud_stuff_view = view_new (0, 48, 152, 16, grav_southwest);
|
|
|
|
hud_stuff_view->draw = draw_stuff;
|
2003-05-08 21:22:33 +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
|
|
|
view_insert (hud_main_view, hud_overlay_view, 0);
|
|
|
|
view_insert (hud_main_view, hud_stuff_view, 0);
|
2022-10-31 15:40:52 +00:00
|
|
|
#endif
|
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);
|
|
|
|
|
2011-09-10 23:04:47 +00:00
|
|
|
if (!strcmp (qfs_gamedir->hudtype, "hipnotic")) {
|
2003-05-09 07:27:46 +00:00
|
|
|
init_hipnotic_sbar_views ();
|
|
|
|
init_hipnotic_hud_views ();
|
2011-09-10 23:04:47 +00:00
|
|
|
} else if (!strcmp (qfs_gamedir->hudtype, "rogue")) {
|
2003-05-09 07:27:46 +00:00
|
|
|
init_rogue_sbar_views ();
|
|
|
|
init_rogue_hud_views ();
|
2003-05-08 21:22:33 +00:00
|
|
|
} else {
|
|
|
|
init_sbar_views ();
|
|
|
|
init_hud_views ();
|
|
|
|
}
|
|
|
|
}
|
2001-05-09 22:40:51 +00:00
|
|
|
|
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));
|
|
|
|
}
|
2021-11-28 15:03:53 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
static void
|
|
|
|
load_pics (void)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2022-10-31 15:40:52 +00:00
|
|
|
for (int i = 0; i < 10; i++) {
|
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));
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
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");
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_colon = r_funcs->Draw_PicFromWad ("num_colon");
|
|
|
|
sb_slash = r_funcs->Draw_PicFromWad ("num_slash");
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[0][0] = r_funcs->Draw_PicFromWad ("inv_shotgun");
|
|
|
|
sb_weapons[0][1] = r_funcs->Draw_PicFromWad ("inv_sshotgun");
|
|
|
|
sb_weapons[0][2] = r_funcs->Draw_PicFromWad ("inv_nailgun");
|
|
|
|
sb_weapons[0][3] = r_funcs->Draw_PicFromWad ("inv_snailgun");
|
|
|
|
sb_weapons[0][4] = r_funcs->Draw_PicFromWad ("inv_rlaunch");
|
|
|
|
sb_weapons[0][5] = r_funcs->Draw_PicFromWad ("inv_srlaunch");
|
|
|
|
sb_weapons[0][6] = r_funcs->Draw_PicFromWad ("inv_lightng");
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[1][0] = r_funcs->Draw_PicFromWad ("inv2_shotgun");
|
|
|
|
sb_weapons[1][1] = r_funcs->Draw_PicFromWad ("inv2_sshotgun");
|
|
|
|
sb_weapons[1][2] = r_funcs->Draw_PicFromWad ("inv2_nailgun");
|
|
|
|
sb_weapons[1][3] = r_funcs->Draw_PicFromWad ("inv2_snailgun");
|
|
|
|
sb_weapons[1][4] = r_funcs->Draw_PicFromWad ("inv2_rlaunch");
|
|
|
|
sb_weapons[1][5] = r_funcs->Draw_PicFromWad ("inv2_srlaunch");
|
|
|
|
sb_weapons[1][6] = r_funcs->Draw_PicFromWad ("inv2_lightng");
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
for (int i = 0; i < 5; i++) {
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][0] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_shotgun", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][1] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_sshotgun", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][2] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_nailgun", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][3] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_snailgun", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][4] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_rlaunch", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][5] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_srlaunch", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
sb_weapons[2 + i][6] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_lightng", i + 1));
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
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");
|
2001-02-19 21:15:25 +00:00
|
|
|
|
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");
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-08-01 05:12:37 +00:00
|
|
|
// MED 01/04/97 added new hipnotic weapons
|
2011-09-10 23:04:47 +00:00
|
|
|
if (!strcmp (qfs_gamedir->hudtype, "hipnotic")) {
|
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");
|
2001-08-01 05:12:37 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
for (int i = 0; i < 5; i++) {
|
2001-08-01 05:12:37 +00:00
|
|
|
hsb_weapons[2 + i][0] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_laser", i + 1));
|
2001-08-01 05:12:37 +00:00
|
|
|
hsb_weapons[2 + i][1] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_mjolnir", i + 1));
|
2001-08-01 05:12:37 +00:00
|
|
|
hsb_weapons[2 + i][2] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_gren_prox", i + 1));
|
2001-08-01 05:12:37 +00:00
|
|
|
hsb_weapons[2 + i][3] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_prox_gren", i + 1));
|
2012-02-14 08:28:09 +00:00
|
|
|
hsb_weapons[2 + i][4] =
|
2021-01-31 07:01:20 +00:00
|
|
|
r_funcs->Draw_PicFromWad (va (0, "inva%i_prox", i + 1));
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
|
|
|
|
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");
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2001-03-09 07:50:45 +00:00
|
|
|
|
|
|
|
// FIXME: MISSIONHUD
|
2011-09-10 23:04:47 +00:00
|
|
|
if (!strcmp (qfs_gamedir->hudtype, "rogue")) {
|
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");
|
2001-08-01 05:12:37 +00:00
|
|
|
|
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");
|
2001-08-01 05:12:37 +00:00
|
|
|
|
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");
|
2001-08-01 05:12:37 +00:00
|
|
|
|
|
|
|
// PGM 01/19/97 - team color border
|
2012-02-14 08:28:09 +00:00
|
|
|
rsb_teambord = r_funcs->Draw_PicFromWad ("r_teambord");
|
2001-08-01 05:12:37 +00:00
|
|
|
// PGM 01/19/97 - team color border
|
|
|
|
|
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");
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2022-10-31 15:40:52 +00:00
|
|
|
}
|
2003-02-11 21:24:27 +00:00
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
void
|
|
|
|
Sbar_Init (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
|
|
|
HUD_Init_Cvars ();
|
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);
|
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);
|
2022-10-31 15:40:52 +00:00
|
|
|
|
|
|
|
load_pics ();
|
|
|
|
init_views ();
|
2022-11-03 05:46:44 +00:00
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
View_UpdateHierarchy (sbar_main);
|
|
|
|
|
2022-11-03 05:46:44 +00:00
|
|
|
sbar_hud_fps_f (0, 0);
|
|
|
|
sbar_hud_time_f (0, 0);
|
|
|
|
|
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");
|
|
|
|
|
2022-10-31 15:40:52 +00:00
|
|
|
r_data->viewsize_callback = viewsize_f;
|
[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);
|
2004-03-02 03:55:18 +00:00
|
|
|
|
|
|
|
// register GIB builtins
|
|
|
|
GIB_Builtin_Add ("print::center", Sbar_GIB_Print_Center_f);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|