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"
|
|
|
|
|
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
|
[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
|
|
|
|
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
|
|
|
|
2001-02-26 06:48:02 +00:00
|
|
|
qpic_t *sb_nums[2][11];
|
|
|
|
qpic_t *sb_colon, *sb_slash;
|
|
|
|
qpic_t *sb_ibar;
|
|
|
|
qpic_t *sb_sbar;
|
|
|
|
qpic_t *sb_scorebar;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-05-14 19:46:16 +00:00
|
|
|
qpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes
|
2001-02-26 06:48:02 +00:00
|
|
|
qpic_t *sb_ammo[4];
|
|
|
|
qpic_t *sb_sigil[4];
|
|
|
|
qpic_t *sb_armor[3];
|
|
|
|
qpic_t *sb_items[32];
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-05-14 19:46:16 +00:00
|
|
|
qpic_t *sb_faces[7][2]; // 0 is gibbed, 1 is dead, 2-6 are alive
|
|
|
|
// 0 is static, 1 is temporary animation
|
2001-02-26 06:48:02 +00:00
|
|
|
qpic_t *sb_face_invis;
|
|
|
|
qpic_t *sb_face_quad;
|
|
|
|
qpic_t *sb_face_invuln;
|
|
|
|
qpic_t *sb_face_invis_invuln;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-02-26 06:48:02 +00:00
|
|
|
qboolean sb_showscores;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-05-14 19:46:16 +00:00
|
|
|
int sb_lines; // scan lines to draw
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-08-01 05:12:37 +00:00
|
|
|
qpic_t *rsb_invbar[2];
|
|
|
|
qpic_t *rsb_weapons[5];
|
|
|
|
qpic_t *rsb_items[2];
|
|
|
|
qpic_t *rsb_ammo[3];
|
|
|
|
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
|
2001-08-01 05:12:37 +00:00
|
|
|
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
|
2001-08-01 05:12:37 +00:00
|
|
|
int hipweapons[4] =
|
|
|
|
{ HIT_LASER_CANNON_BIT, HIT_MJOLNIR_BIT, 4, HIT_PROXIMITY_GUN_BIT };
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static int
|
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
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2001-02-19 21:15:25 +00:00
|
|
|
Sbar_ShowScores (void)
|
|
|
|
{
|
|
|
|
if (sb_showscores)
|
|
|
|
return;
|
2011-08-22 11:00:17 +00:00
|
|
|
|
2001-02-19 21:15:25 +00:00
|
|
|
sb_showscores = true;
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2001-02-19 21:15:25 +00:00
|
|
|
Sbar_DontShowScores (void)
|
|
|
|
{
|
|
|
|
sb_showscores = false;
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Sbar_Changed (void)
|
|
|
|
{
|
2001-02-26 06:48:02 +00:00
|
|
|
sb_updates = 0; // update next frame
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2009-12-19 10:54:23 +00:00
|
|
|
static void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view_t *view, int x, int y, qpic_t *pic)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_Pic (view->xabs + x, view->yabs + y, pic);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2001-12-09 14:05:30 +00:00
|
|
|
static inline void
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_cachepic (view_t *view, int x, int y, const char *name, int cent)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
qpic_t *pic = r_funcs->Draw_CachePic (name, true);
|
2003-05-09 07:27:46 +00:00
|
|
|
if (cent)
|
|
|
|
x += (view->xlen - pic->width) / 2;
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_Pic (view->xabs + x, view->yabs + y, pic);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2001-12-09 14:05:30 +00:00
|
|
|
static inline void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_subpic (view_t *view, int x, int y, qpic_t *pic,
|
|
|
|
int srcx, int srcy, int width, int height)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_SubPic (view->xabs + x, view->yabs + y, pic,
|
2003-05-08 21:22:33 +00:00
|
|
|
srcx, srcy, width, height);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2001-12-09 14:05:30 +00:00
|
|
|
static inline void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_transpic (view_t *view, int x, int y, qpic_t *pic)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_Pic (view->xabs + x, view->yabs + y, pic);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2001-05-09 22:40:51 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
// drawing routines are reletive to the status bar location
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-12-09 14:05:30 +00:00
|
|
|
static inline void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_character (view_t *view, int x, int y, int c)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_Character (view->xabs + x, view->yabs + y, c);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static inline void
|
|
|
|
draw_string (view_t *view, int x, int y, const char *str)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_String (view->xabs + x, view->yabs + y, str);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-03-30 18:02:55 +00:00
|
|
|
#if 0
|
2003-05-08 21:22:33 +00:00
|
|
|
static inline void
|
|
|
|
draw_altstring (view_t *view, int x, int y, const char *str)
|
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_AltString (view->xabs + x, view->yabs + y, str);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2022-05-04 12:03:34 +00:00
|
|
|
#endif
|
2003-05-08 21:22:33 +00:00
|
|
|
static inline void
|
|
|
|
draw_nstring (view_t *view, int x, int y, const char *str, int n)
|
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_nString (view->xabs + x, view->yabs + y, str, n);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
2022-05-04 12:03:34 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static inline void
|
|
|
|
draw_fill (view_t *view, int x, int y, int w, int h, int col)
|
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_Fill (view->xabs + x, view->yabs + y, w, h, col);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_num (view_t *view, int x, int y, 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;
|
|
|
|
int l, frame;
|
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);
|
2001-02-19 21:15:25 +00:00
|
|
|
if (l < digits)
|
2001-02-26 06:48:02 +00:00
|
|
|
x += (digits - l) * 24;
|
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
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_transpic (view, x, y, sb_nums[color][frame]);
|
2001-02-19 21:15:25 +00:00
|
|
|
x += 24;
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static inline void
|
|
|
|
draw_smallnum (view_t *view, int x, int y, int n, int packed, int colored)
|
|
|
|
{
|
2018-08-19 15:05:00 +00:00
|
|
|
char num[12];
|
2003-05-08 21:22:33 +00:00
|
|
|
|
|
|
|
packed = packed != 0; // ensure 0 or 1
|
|
|
|
|
2003-07-08 22:39:45 +00:00
|
|
|
if (n > 999)
|
|
|
|
n = 999;
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
snprintf (num, sizeof (num), "%3d", n);
|
|
|
|
if (colored) {
|
|
|
|
if (num[0] != ' ')
|
|
|
|
num[0] = 18 + num[0] - '0';
|
|
|
|
if (num[1] != ' ')
|
|
|
|
num[1] = 18 + num[1] - '0';
|
|
|
|
if (num[2] != ' ')
|
|
|
|
num[2] = 18 + num[2] - '0';
|
|
|
|
}
|
|
|
|
draw_character (view, x + packed, y, num[0]);
|
|
|
|
draw_character (view, x + 8, y, num[1]);
|
|
|
|
draw_character (view, x + 16 - packed, y, num[2]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_tile (view_t *view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2012-02-14 08:28:09 +00:00
|
|
|
r_funcs->Draw_TileClear (view->xabs, view->yabs, view->xlen, view->ylen);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
2011-08-22 11:00:17 +00:00
|
|
|
draw_ammo_sbar (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++) {
|
|
|
|
count = cl.stats[STAT_SHELLS + i];
|
2011-08-22 11:00:17 +00:00
|
|
|
draw_smallnum (view, (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
|
2011-08-22 11:00:17 +00:00
|
|
|
draw_ammo_hud (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++) {
|
|
|
|
count = cl.stats[STAT_SHELLS + i];
|
|
|
|
draw_subpic (view, 0, i * 11, sb_ibar, 3 + (i * 48), 0, 42, 11);
|
|
|
|
draw_smallnum (view, 7, i * 11, count, 0, 1);
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
|
draw_weapons_sbar (view_t *view)
|
|
|
|
{
|
|
|
|
int flashon, i;
|
|
|
|
|
|
|
|
for (i = 0; i < 7; i++) {
|
|
|
|
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
|
|
|
draw_pic (view, i * 24, 0, sb_weapons[flashon][i]);
|
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_weapons_hud (view_t *view)
|
|
|
|
{
|
2011-08-22 11:00:17 +00:00
|
|
|
int flashon, i, x = 0;
|
|
|
|
|
|
|
|
if (view->parent->gravity == grav_southeast)
|
|
|
|
x = view->xlen - 24;
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
for (i = r_data->vid->conview->ylen < 204; i < 7; 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);
|
2011-08-22 11:00:17 +00:00
|
|
|
draw_subpic (view, x, i * 16, sb_weapons[flashon][i], 0, 0, 24, 16);
|
2003-05-08 21:22:33 +00:00
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_items (view_t *view)
|
|
|
|
{
|
|
|
|
float time;
|
|
|
|
int flashon = 0, i;
|
|
|
|
|
|
|
|
for (i = 0; i < 6; i++) {
|
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (17 + i))) {
|
|
|
|
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;
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_sigils (view_t *view)
|
|
|
|
{
|
|
|
|
float time;
|
|
|
|
int flashon = 0, i;
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
if (cl.stats[STAT_ITEMS] & (1 << (28 + i))) {
|
|
|
|
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;
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
2001-08-01 05:12:37 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
|
|
|
draw_inventory_sbar (view_t *view)
|
|
|
|
{
|
|
|
|
draw_pic (view, 0, 0, sb_ibar);
|
|
|
|
view_draw (view);
|
|
|
|
}
|
2001-05-09 22:40:51 +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
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
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-05-04 12:03:34 +00:00
|
|
|
static void
|
|
|
|
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
|
|
|
|
|
|
|
static void
|
|
|
|
draw_solo (view_t *view)
|
|
|
|
{
|
|
|
|
char str[80];
|
2022-05-04 12:03:34 +00:00
|
|
|
int minutes, seconds;
|
2011-08-22 11:00:17 +00:00
|
|
|
int l;
|
|
|
|
|
|
|
|
draw_pic (view, 0, 0, sb_scorebar);
|
|
|
|
|
|
|
|
snprintf (str, sizeof (str), "Monsters:%3i /%3i", cl.stats[STAT_MONSTERS],
|
|
|
|
cl.stats[STAT_TOTALMONSTERS]);
|
|
|
|
draw_string (view, 8, 4, str);
|
|
|
|
|
|
|
|
snprintf (str, sizeof (str), "Secrets :%3i /%3i", cl.stats[STAT_SECRETS],
|
|
|
|
cl.stats[STAT_TOTALSECRETS]);
|
|
|
|
draw_string (view, 8, 12, str);
|
|
|
|
|
|
|
|
// time
|
|
|
|
minutes = cl.time / 60;
|
2022-05-04 12:03:34 +00:00
|
|
|
seconds = cl.time - 60 * minutes;
|
|
|
|
snprintf (str, sizeof (str), "Time :%3i:%02i", minutes, seconds);
|
2011-08-22 11:00:17 +00:00
|
|
|
draw_string (view, 184, 4, str);
|
|
|
|
|
|
|
|
// draw level name
|
|
|
|
l = strlen (cl.levelname);
|
|
|
|
l = 232 - l * 4;
|
|
|
|
draw_string (view, max (l, 152), 12, cl.levelname);
|
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_frags (view_t *view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_face (view_t *view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2001-02-26 06:48:02 +00:00
|
|
|
int f, anim;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2001-05-15 17:22:53 +00:00
|
|
|
if ((cl.stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY))
|
2001-02-26 06:48:02 +00:00
|
|
|
== (IT_INVISIBILITY | IT_INVULNERABILITY)) {
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 112, 0, sb_face_invis_invuln);
|
2001-02-19 21:15:25 +00:00
|
|
|
return;
|
|
|
|
}
|
2001-05-15 17:22:53 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_QUAD) {
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 112, 0, sb_face_quad);
|
2001-02-19 21:15:25 +00:00
|
|
|
return;
|
|
|
|
}
|
2001-05-15 17:22:53 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 112, 0, sb_face_invis);
|
2001-02-19 21:15:25 +00:00
|
|
|
return;
|
|
|
|
}
|
2001-05-15 17:22:53 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 112, 0, sb_face_invuln);
|
2001-02-19 21:15:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cl.stats[STAT_HEALTH] >= 100)
|
|
|
|
f = 4;
|
|
|
|
else
|
|
|
|
f = cl.stats[STAT_HEALTH] / 20;
|
|
|
|
|
|
|
|
if (cl.time <= cl.faceanimtime) {
|
|
|
|
anim = 1;
|
2001-02-26 06:48:02 +00:00
|
|
|
sb_updates = 0; // make sure the anim gets drawn over
|
2003-05-08 21:22:33 +00:00
|
|
|
} else
|
2001-02-19 21:15:25 +00:00
|
|
|
anim = 0;
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 112, 0, sb_faces[f][anim]);
|
2001-02-19 21:15:25 +00:00
|
|
|
}
|
|
|
|
|
2003-01-06 18:28:13 +00:00
|
|
|
static void
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_status_bar (view_t *view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 0, 0, sb_sbar);
|
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
|
|
|
|
draw_armor (view_t *view)
|
2003-05-09 07:27:46 +00:00
|
|
|
{
|
2001-05-15 17:22:53 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_num (view, 24, 0, 666, 3, 1);
|
2001-02-19 21:15:25 +00:00
|
|
|
} else {
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_num (view, 24, 0, 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)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 0, 0, sb_armor[2]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 0, 0, sb_armor[1]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_ARMOR1)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 0, 0, sb_armor[0]);
|
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
|
|
|
|
draw_health (view_t *view)
|
|
|
|
{
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_num (view, 136, 0, cl.stats[STAT_HEALTH], 3,
|
2003-05-09 07:27:46 +00:00
|
|
|
cl.stats[STAT_HEALTH] <= 25);
|
2003-05-09 16:52:41 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-10 02:54:17 +00:00
|
|
|
static inline void
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_ammo (view_t *view)
|
|
|
|
{
|
2003-05-09 07:27:46 +00:00
|
|
|
if (cl.stats[STAT_ITEMS] & IT_SHELLS)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 224, 0, sb_ammo[0]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_NAILS)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 224, 0, sb_ammo[1]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_ROCKETS)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 224, 0, sb_ammo[2]);
|
2003-05-09 07:27:46 +00:00
|
|
|
else if (cl.stats[STAT_ITEMS] & IT_CELLS)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 224, 0, sb_ammo[3]);
|
2003-05-10 02:54:17 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_num (view, 248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
draw_armor (view);
|
|
|
|
draw_face (view);
|
|
|
|
draw_health (view);
|
|
|
|
draw_ammo (view);
|
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_rogue_weapons_sbar (view_t *view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
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
|
|
|
}
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
static void
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_rogue_weapons_hud (view_t *view)
|
|
|
|
{
|
2003-05-10 02:54:17 +00:00
|
|
|
int flashon, i, j;
|
|
|
|
qpic_t *pic;
|
2003-05-09 16:52:41 +00:00
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
for (i = r_data->vid->conview->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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_rogue_ammo_hud (view_t *view)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_rogue_items (view_t *view)
|
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;
|
|
|
|
}
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_rogue_inventory_sbar (view_t *view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_rogue_face (view_t *view)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_rogue_status (view_t *view)
|
|
|
|
{
|
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_hipnotic_weapons_sbar (view_t *view)
|
2003-05-08 21:22:33 +00:00
|
|
|
{
|
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
|
|
|
}
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_hipnotic_weapons_hud (view_t *view)
|
|
|
|
{
|
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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_hipnotic_items (view_t *view)
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_hipnotic_inventory_sbar (view_t *view)
|
|
|
|
{
|
|
|
|
draw_pic (view, 0, 0, sb_ibar);
|
|
|
|
view_draw (view);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-05-09 16:52:41 +00:00
|
|
|
draw_hipnotic_status (view_t *view)
|
2003-05-09 07:27:46 +00:00
|
|
|
{
|
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]);
|
|
|
|
}
|
|
|
|
|
2013-01-13 11:08:01 +00:00
|
|
|
static void
|
|
|
|
sbar_update_vis (void)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
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 &&
|
2021-07-10 09:04:34 +00:00
|
|
|
con_module->data->console->lines == r_data->vid->conview->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++;
|
2013-01-13 11:08:01 +00:00
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2013-01-13 11:08:01 +00:00
|
|
|
void
|
|
|
|
Sbar_Draw (void)
|
|
|
|
{
|
2022-05-16 11:51:37 +00:00
|
|
|
if (cls.state != ca_active) {
|
|
|
|
return;
|
|
|
|
}
|
2013-01-13 11:08:01 +00:00
|
|
|
sbar_update_vis ();
|
[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->draw (hud_main_view);
|
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
|
|
|
{
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:53:41 +00:00
|
|
|
static void
|
|
|
|
Sbar_DrawScoreboard (void)
|
|
|
|
{
|
|
|
|
//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);
|
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);
|
2021-03-29 08:27:06 +00:00
|
|
|
draw_string (view, 8, 0, st);
|
[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);
|
2021-03-29 08:27:06 +00:00
|
|
|
draw_string (view, 8, 0, st);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_fps (view_t *view)
|
|
|
|
{
|
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;
|
2003-07-27 22:25:45 +00:00
|
|
|
snprintf (st, sizeof (st), "%5.1f FPS", lastfps);
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
2003-07-27 22:25:45 +00:00
|
|
|
draw_string (view, 80, 8, st);
|
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
|
|
|
|
draw_stuff (view_t *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
|
|
|
if (hud_time > 0)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_time (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
|
|
|
if (hud_fps > 0)
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_fps (view);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_intermission (view_t *view)
|
2001-02-19 21:15:25 +00:00
|
|
|
{
|
2001-02-26 06:48:02 +00:00
|
|
|
int dig;
|
|
|
|
int num;
|
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, 64, 24, "gfx/complete.lmp", 0);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
draw_cachepic (view, 0, 56, "gfx/inter.lmp", 0);
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
// time
|
2001-02-26 06:48:02 +00:00
|
|
|
dig = cl.completed_time / 60;
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_num (view, 160, 64, dig, 3, 0);
|
2001-02-26 06:48:02 +00:00
|
|
|
num = cl.completed_time - dig * 60;
|
2003-05-08 21:22:33 +00:00
|
|
|
draw_pic (view, 234, 64, sb_colon);
|
|
|
|
draw_pic (view, 246, 64, sb_nums[0][num / 10]);
|
|
|
|
draw_pic (view, 266, 64, sb_nums[0][num % 10]);
|
|
|
|
|
|
|
|
draw_num (view, 160, 104, cl.stats[STAT_SECRETS], 3, 0);
|
|
|
|
draw_pic (view, 232, 104, sb_slash);
|
|
|
|
draw_num (view, 240, 104, cl.stats[STAT_TOTALSECRETS], 3, 0);
|
|
|
|
|
|
|
|
draw_num (view, 160, 144, cl.stats[STAT_MONSTERS], 3, 0);
|
|
|
|
draw_pic (view, 232, 144, sb_slash);
|
|
|
|
draw_num (view, 240, 144, cl.stats[STAT_TOTALMONSTERS], 3, 0);
|
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
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;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
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;
|
|
|
|
}
|
[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_intermission (hud_overlay_view);
|
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
|
|
|
|
Sbar_DrawCenterString (view_t *view, int remaining)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
2001-02-19 21:15:25 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
Sbar_FinaleOverlay (void)
|
|
|
|
{
|
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);
|
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)
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
draw_miniteam (view_t *view)
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
|
|
|
init_sbar_views (void)
|
|
|
|
{
|
|
|
|
view_t *view;
|
|
|
|
|
|
|
|
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_inventory_sbar;
|
|
|
|
|
|
|
|
view = view_new (0, 0, 32, 16, grav_southwest);
|
|
|
|
view->draw = draw_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 (32, 0, 96, 16, grav_southeast);
|
|
|
|
view->draw = draw_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);
|
|
|
|
|
|
|
|
view = view_new (0, 0, 320, 24, grav_southwest);
|
|
|
|
view->draw = draw_status;
|
|
|
|
view_add (sbar_view, view);
|
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
if (r_data->vid->conview->xlen > 320) {
|
|
|
|
int l = (r_data->vid->conview->xlen - 320) / 2;
|
2003-05-08 21:22:33 +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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_hud_views (void)
|
|
|
|
{
|
|
|
|
view_t *view;
|
2022-05-04 12:03:34 +00:00
|
|
|
view_t *minifrags_view = 0;
|
|
|
|
view_t *miniteam_view = 0;
|
|
|
|
|
|
|
|
if (r_data->vid->conview->xlen < 512) {
|
|
|
|
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;
|
|
|
|
} else if (r_data->vid->conview->xlen < 640) {
|
|
|
|
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);
|
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
view = view_new (0, 0, r_data->vid->conview->xlen, 48, grav_south);
|
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);
|
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
|
|
|
{
|
|
|
|
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
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
if (r_data->vid->conview->xlen > 320) {
|
|
|
|
int l = (r_data->vid->conview->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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_hipnotic_hud_views (void)
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
if (r_data->vid->conview->ylen < 252) {
|
2012-02-14 08:28:09 +00:00
|
|
|
hud_armament_view = view_new (0,
|
2021-07-10 09:04:34 +00:00
|
|
|
min (r_data->vid->conview->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);
|
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
view = view_new (0, 0, r_data->vid->conview->xlen, 48, grav_south);
|
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);
|
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
|
|
|
{
|
|
|
|
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
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
if (r_data->vid->conview->xlen > 320) {
|
|
|
|
int l = (r_data->vid->conview->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);
|
|
|
|
}
|
2003-05-08 21:22:33 +00:00
|
|
|
}
|
|
|
|
|
2003-05-09 07:27:46 +00:00
|
|
|
static void
|
|
|
|
init_rogue_hud_views (void)
|
|
|
|
{
|
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);
|
|
|
|
|
2021-07-10 09:04:34 +00:00
|
|
|
view = view_new (0, 0, r_data->vid->conview->xlen, 48, grav_south);
|
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);
|
2003-05-09 07:27:46 +00:00
|
|
|
}
|
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
static void
|
|
|
|
init_views (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_main_view = view_new (0, 0, r_data->vid->conview->xlen,
|
2021-07-10 09:04:34 +00:00
|
|
|
r_data->vid->conview->ylen,
|
2013-01-08 12:36:28 +00:00
|
|
|
grav_northwest);
|
|
|
|
if (con_module)
|
[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 (con_module->data->console->view, hud_main_view, 0);
|
|
|
|
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
|
2021-07-10 09:04:34 +00:00
|
|
|
if (r_data->vid->conview->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
|
[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, r_data->vid->conview->ylen,
|
2012-02-14 08:28:09 +00:00
|
|
|
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);
|
2003-05-08 21:22:33 +00:00
|
|
|
|
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
|
|
|
|
2001-02-19 21:15:25 +00:00
|
|
|
void
|
|
|
|
Sbar_Init (void)
|
|
|
|
{
|
2001-02-26 06:48:02 +00:00
|
|
|
int i;
|
2001-02-19 21:15:25 +00:00
|
|
|
|
2003-05-08 21:22:33 +00:00
|
|
|
init_views ();
|
|
|
|
|
2001-02-26 06:48:02 +00:00
|
|
|
for (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
|
|
|
|
|
|
|
for (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
|
|
|
|
2011-08-22 11:00:17 +00:00
|
|
|
Cmd_AddCommand ("+showscores", Sbar_ShowScores,
|
|
|
|
"Display information on everyone playing");
|
|
|
|
Cmd_AddCommand ("-showscores", Sbar_DontShowScores,
|
|
|
|
"Stop displaying information on everyone playing");
|
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
|
|
|
|
|
|
|
for (i = 0; i < 5; i++) {
|
|
|
|
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
|
|
|
}
|
2003-02-11 21:24:27 +00:00
|
|
|
|
2012-02-14 08:28:09 +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
|
|
|
HUD_Init_Cvars ();
|
|
|
|
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
|
|
|
}
|