2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
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
|
2005-11-26 03:02:55 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
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 the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
// sbar.c -- status bar code
|
|
|
|
|
|
|
|
#include "quakedef.h"
|
2009-11-04 21:16:50 +00:00
|
|
|
#include "shader.h"
|
|
|
|
|
2005-12-08 18:42:08 +00:00
|
|
|
extern cvar_t hud_tracking_show;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-03-12 22:48:09 +00:00
|
|
|
#define CON_ALTMASK (CON_2NDCHARSETTEXT|CON_WHITEMASK)
|
2010-07-11 02:22:39 +00:00
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
cvar_t scr_scoreboard_drawtitle = SCVAR("scr_scoreboard_drawtitle", "1");
|
2007-10-02 16:00:38 +00:00
|
|
|
cvar_t scr_scoreboard_forcecolors = SCVAR("scr_scoreboard_forcecolors", "0"); //damn americans
|
|
|
|
cvar_t scr_scoreboard_newstyle = SCVAR("scr_scoreboard_newstyle", "1"); // New scoreboard style ported from Electro, by Molgrum
|
2007-07-23 18:52:11 +00:00
|
|
|
cvar_t scr_scoreboard_showfrags = SCVAR("scr_scoreboard_showfrags", "0");
|
2007-10-02 16:00:38 +00:00
|
|
|
cvar_t scr_scoreboard_teamscores = SCVAR("scr_scoreboard_teamscores", "1");
|
2007-07-23 18:52:11 +00:00
|
|
|
cvar_t scr_scoreboard_titleseperator = SCVAR("scr_scoreboard_titleseperator", "1");
|
2008-11-09 22:29:28 +00:00
|
|
|
cvar_t sbar_teamstatus = SCVAR("sbar_teamstatus", "1");
|
2007-07-23 18:52:11 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
//===========================================
|
|
|
|
//rogue changed and added defines
|
|
|
|
|
|
|
|
#define RIT_SHELLS 128
|
|
|
|
#define RIT_NAILS 256
|
|
|
|
#define RIT_ROCKETS 512
|
|
|
|
#define RIT_CELLS 1024
|
|
|
|
#define RIT_AXE 2048
|
|
|
|
#define RIT_LAVA_NAILGUN 4096
|
|
|
|
#define RIT_LAVA_SUPER_NAILGUN 8192
|
|
|
|
#define RIT_MULTI_GRENADE 16384
|
|
|
|
#define RIT_MULTI_ROCKET 32768
|
|
|
|
#define RIT_PLASMA_GUN 65536
|
|
|
|
#define RIT_ARMOR1 8388608
|
|
|
|
#define RIT_ARMOR2 16777216
|
|
|
|
#define RIT_ARMOR3 33554432
|
|
|
|
#define RIT_LAVA_NAILS 67108864
|
|
|
|
#define RIT_PLASMA_AMMO 134217728
|
|
|
|
#define RIT_MULTI_ROCKETS 268435456
|
|
|
|
#define RIT_SHIELD 536870912
|
|
|
|
#define RIT_ANTIGRAV 1073741824
|
|
|
|
#define RIT_SUPERHEALTH 2147483648
|
|
|
|
|
|
|
|
//===========================================
|
|
|
|
//hipnotic added defines
|
|
|
|
|
|
|
|
#define HIT_PROXIMITY_GUN_BIT 16
|
|
|
|
#define HIT_MJOLNIR_BIT 7
|
|
|
|
#define HIT_LASER_CANNON_BIT 23
|
|
|
|
#define HIT_PROXIMITY_GUN (1<<HIT_PROXIMITY_GUN_BIT)
|
|
|
|
#define HIT_MJOLNIR (1<<HIT_MJOLNIR_BIT)
|
|
|
|
#define HIT_LASER_CANNON (1<<HIT_LASER_CANNON_BIT)
|
|
|
|
#define HIT_WETSUIT (1<<(23+2))
|
|
|
|
#define HIT_EMPATHY_SHIELDS (1<<(23+3))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int sb_updates; // if >= vid.numpages, no update needed
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
qboolean sbar_parsingteamstatuses; //so we don't eat it if its not displayed
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
#define STAT_MINUS 10 // num frame for '-' stats digit
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *sb_nums[2][11];
|
|
|
|
mpic_t *sb_colon, *sb_slash;
|
|
|
|
mpic_t *sb_ibar;
|
|
|
|
mpic_t *sb_sbar;
|
|
|
|
mpic_t *sb_scorebar;
|
|
|
|
|
|
|
|
mpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes
|
|
|
|
mpic_t *sb_ammo[4];
|
|
|
|
mpic_t *sb_sigil[4];
|
|
|
|
mpic_t *sb_armor[3];
|
|
|
|
mpic_t *sb_items[32];
|
|
|
|
|
|
|
|
mpic_t *sb_faces[7][2]; // 0 is gibbed, 1 is dead, 2-6 are alive
|
2004-08-23 00:15:46 +00:00
|
|
|
// 0 is static, 1 is temporary animation
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *sb_face_invis;
|
|
|
|
mpic_t *sb_face_quad;
|
|
|
|
mpic_t *sb_face_invuln;
|
|
|
|
mpic_t *sb_face_invis_invuln;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
//rogue pictures.
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *rsb_invbar[2];
|
|
|
|
mpic_t *rsb_weapons[5];
|
|
|
|
mpic_t *rsb_items[2];
|
|
|
|
mpic_t *rsb_ammo[3];
|
|
|
|
mpic_t *rsb_teambord;
|
2004-08-23 00:15:46 +00:00
|
|
|
//all must be found for any to be used.
|
|
|
|
|
|
|
|
qboolean sb_showscores;
|
|
|
|
qboolean sb_showteamscores;
|
|
|
|
|
|
|
|
qboolean sbarfailed;
|
|
|
|
qboolean sbar_rogue;
|
|
|
|
qboolean sbar_hexen2;
|
|
|
|
|
|
|
|
vrect_t sbar_rect; //screen area that the sbar must fit.
|
|
|
|
|
|
|
|
int sb_lines; // scan lines to draw
|
|
|
|
|
|
|
|
void Sbar_DeathmatchOverlay (int start);
|
|
|
|
void Sbar_TeamOverlay (void);
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_MiniDeathmatchOverlay (playerview_t *pv);
|
|
|
|
void Sbar_ChatModeOverlay(playerview_t *pv);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
int Sbar_PlayerNum(playerview_t *pv)
|
2007-07-23 18:52:11 +00:00
|
|
|
{
|
|
|
|
int num;
|
2013-06-23 02:17:02 +00:00
|
|
|
num = cl.spectator?Cam_TrackNum(pv):-1;
|
2007-07-23 18:52:11 +00:00
|
|
|
if (num < 0)
|
2013-06-23 02:17:02 +00:00
|
|
|
num = pv->playernum;
|
2007-07-23 18:52:11 +00:00
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
|
|
|
int Sbar_TopColour(player_info_t *p)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_forcecolors.ival)
|
2007-07-23 18:52:11 +00:00
|
|
|
return p->ttopcolor;
|
|
|
|
else
|
|
|
|
return p->rtopcolor;
|
|
|
|
}
|
|
|
|
|
|
|
|
int Sbar_BottomColour(player_info_t *p)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_forcecolors.ival)
|
2007-07-23 18:52:11 +00:00
|
|
|
return p->tbottomcolor;
|
|
|
|
else
|
|
|
|
return p->rbottomcolor;
|
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
//Draws a pre-marked-up string with no width limit. doesn't support new lines
|
2009-05-24 10:11:17 +00:00
|
|
|
void Draw_ExpandedString(int x, int y, conchar_t *str)
|
2005-01-04 07:31:57 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_BeginString(font_conchar, x, y, &x, &y);
|
2005-01-04 07:31:57 +00:00
|
|
|
while(*str)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
x = Font_DrawChar(x, y, *str++);
|
2005-01-04 07:31:57 +00:00
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_EndString(font_conchar);
|
2005-01-04 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
//Draws a marked-up string using the regular char set with no width limit. doesn't support new lines
|
2010-07-11 10:53:13 +00:00
|
|
|
void Draw_FunString(int x, int y, const void *str)
|
2005-02-06 02:47:36 +00:00
|
|
|
{
|
2009-05-24 10:11:17 +00:00
|
|
|
conchar_t buffer[2048];
|
2009-07-05 18:45:53 +00:00
|
|
|
COM_ParseFunString(CON_WHITEMASK, str, buffer, sizeof(buffer), false);
|
2005-02-06 02:47:36 +00:00
|
|
|
|
2009-05-24 10:11:17 +00:00
|
|
|
Draw_ExpandedString(x, y, buffer);
|
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
//Draws a marked up string using the alt char set (legacy mode would be |128)
|
2010-07-11 10:53:13 +00:00
|
|
|
void Draw_AltFunString(int x, int y, const void *str)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
conchar_t buffer[2048];
|
2010-07-11 02:22:39 +00:00
|
|
|
COM_ParseFunString(CON_ALTMASK, str, buffer, sizeof(buffer), false);
|
2009-11-04 21:16:50 +00:00
|
|
|
|
|
|
|
Draw_ExpandedString(x, y, buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
//Draws a marked up string no wider than $width virtual pixels.
|
2010-07-11 10:53:13 +00:00
|
|
|
void Draw_FunStringWidth(int x, int y, const void *str, int width)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
conchar_t buffer[2048];
|
|
|
|
conchar_t *w = buffer;
|
|
|
|
|
2011-02-25 04:22:14 +00:00
|
|
|
width = (width*vid.rotpixelwidth)/vid.width;
|
2009-11-04 21:16:50 +00:00
|
|
|
|
|
|
|
COM_ParseFunString(CON_WHITEMASK, str, buffer, sizeof(buffer), false);
|
|
|
|
|
|
|
|
Font_BeginString(font_conchar, x, y, &x, &y);
|
|
|
|
while(*w)
|
|
|
|
{
|
|
|
|
width -= Font_CharWidth(*w);
|
|
|
|
if (width < 0)
|
|
|
|
return;
|
|
|
|
x = Font_DrawChar(x, y, *w++);
|
|
|
|
}
|
|
|
|
Font_EndString(font_conchar);
|
|
|
|
}
|
2005-02-06 02:47:36 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
static qboolean largegame = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef Q2CLIENT
|
2010-07-11 02:22:39 +00:00
|
|
|
static void DrawHUDString (char *string, int x, int y, int centerwidth, qboolean alt)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2010-07-11 02:22:39 +00:00
|
|
|
R_DrawTextField(x, y, centerwidth, 1024, string, alt?CON_ALTMASK:CON_WHITEMASK, CPRINT_TALIGN);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
#define STAT_MINUS 10 // num frame for '-' stats digit
|
2010-07-11 02:22:39 +00:00
|
|
|
static char *q2sb_nums[2][11] =
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
{"num_0", "num_1", "num_2", "num_3", "num_4", "num_5",
|
|
|
|
"num_6", "num_7", "num_8", "num_9", "num_minus"},
|
|
|
|
{"anum_0", "anum_1", "anum_2", "anum_3", "anum_4", "anum_5",
|
|
|
|
"anum_6", "anum_7", "anum_8", "anum_9", "anum_minus"}
|
|
|
|
};
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
static mpic_t *Sbar_Q2CachePic(char *name)
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
return R2D_SafeCachePic(va("pics/%s.pcx", name));
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
#define ICON_WIDTH 24
|
|
|
|
#define ICON_HEIGHT 24
|
|
|
|
#define CHAR_WIDTH 16
|
|
|
|
#define ICON_SPACE 8
|
2010-07-11 02:22:39 +00:00
|
|
|
static void SCR_DrawField (int x, int y, int color, int width, int value)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
char num[16], *ptr;
|
|
|
|
int l;
|
|
|
|
int frame;
|
2009-11-04 21:16:50 +00:00
|
|
|
mpic_t *p;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (width < 1)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// draw number string
|
|
|
|
if (width > 5)
|
|
|
|
width = 5;
|
|
|
|
|
2006-03-06 01:41:09 +00:00
|
|
|
snprintf (num, sizeof(num), "%i", value);
|
2004-08-23 00:15:46 +00:00
|
|
|
l = strlen(num);
|
|
|
|
if (l > width)
|
|
|
|
l = width;
|
|
|
|
x += 2 + CHAR_WIDTH*(width - l);
|
|
|
|
|
|
|
|
ptr = num;
|
|
|
|
while (*ptr && l)
|
|
|
|
{
|
|
|
|
if (*ptr == '-')
|
|
|
|
frame = STAT_MINUS;
|
|
|
|
else
|
|
|
|
frame = *ptr -'0';
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
p = Sbar_Q2CachePic(q2sb_nums[color][frame]);
|
|
|
|
if (p)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic (x,y,p->width, p->height, p);
|
2004-08-23 00:15:46 +00:00
|
|
|
x += CHAR_WIDTH;
|
|
|
|
ptr++;
|
|
|
|
l--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char *Get_Q2ConfigString(int i)
|
|
|
|
{
|
|
|
|
if (i >= Q2CS_IMAGES && i < Q2CS_IMAGES + Q2MAX_IMAGES)
|
|
|
|
return cl.image_name [i-Q2CS_IMAGES];
|
|
|
|
if (i == Q2CS_STATUSBAR)
|
|
|
|
return cl.q2statusbar;
|
|
|
|
|
|
|
|
if (i >= Q2CS_MODELS && i < Q2CS_MODELS + Q2MAX_MODELS)
|
|
|
|
return cl.model_name [i-Q2CS_MODELS];
|
|
|
|
if (i >= Q2CS_SOUNDS && i < Q2CS_SOUNDS + Q2MAX_SOUNDS)
|
|
|
|
return cl.model_name [i-Q2CS_SOUNDS];
|
2010-07-11 02:22:39 +00:00
|
|
|
if (i == Q2CS_AIRACCEL)
|
|
|
|
return "4";
|
2004-08-23 00:15:46 +00:00
|
|
|
//#define Q2CS_LIGHTS (Q2CS_IMAGES +Q2MAX_IMAGES)
|
|
|
|
//#define Q2CS_ITEMS (Q2CS_LIGHTS +Q2MAX_LIGHTSTYLES)
|
|
|
|
//#define Q2CS_PLAYERSKINS (Q2CS_ITEMS +Q2MAX_ITEMS)
|
|
|
|
//#define Q2CS_GENERAL (Q2CS_PLAYERSKINS +Q2MAX_CLIENTS)
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
void Sbar_ExecuteLayoutString (char *s)
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
int value;
|
|
|
|
int width;
|
|
|
|
int index;
|
|
|
|
// q2clientinfo_t *ci;
|
2009-11-04 21:16:50 +00:00
|
|
|
mpic_t *p;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (cls.state != ca_active)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!s[0])
|
|
|
|
return;
|
|
|
|
|
2005-03-15 03:25:37 +00:00
|
|
|
x = sbar_rect.x;
|
|
|
|
y = sbar_rect.y;
|
2004-08-23 00:15:46 +00:00
|
|
|
width = 3;
|
|
|
|
|
|
|
|
while (s)
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
|
|
|
if (!strcmp(com_token, "xl"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2005-03-15 03:25:37 +00:00
|
|
|
x = sbar_rect.x + atoi(com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(com_token, "xr"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2005-03-15 03:25:37 +00:00
|
|
|
x = sbar_rect.x + sbar_rect.width + atoi(com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(com_token, "xv"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2005-03-15 03:25:37 +00:00
|
|
|
x = sbar_rect.x + sbar_rect.width/2 - 160 + atoi(com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "yt"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2005-03-15 03:25:37 +00:00
|
|
|
y = sbar_rect.y + atoi(com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(com_token, "yb"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2005-03-15 03:25:37 +00:00
|
|
|
y = sbar_rect.y + sbar_rect.height + atoi(com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(com_token, "yv"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2005-03-15 03:25:37 +00:00
|
|
|
y = sbar_rect.y + sbar_rect.height/2 - 120 + atoi(com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "pic"))
|
|
|
|
{ // draw a pic from a stat number
|
|
|
|
s = COM_Parse (s);
|
|
|
|
value = cl.q2frame.playerstate.stats[atoi(com_token)];
|
|
|
|
if (value >= Q2MAX_IMAGES || value < 0)
|
|
|
|
Host_EndGame ("Pic >= Q2MAX_IMAGES");
|
|
|
|
if (Get_Q2ConfigString(Q2CS_IMAGES+value))
|
|
|
|
{
|
|
|
|
// SCR_AddDirtyPoint (x, y);
|
|
|
|
// SCR_AddDirtyPoint (x+23, y+23);
|
2009-11-04 21:16:50 +00:00
|
|
|
p = Sbar_Q2CachePic(Get_Q2ConfigString(Q2CS_IMAGES+value));
|
|
|
|
if (p)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic (x, y, p->width, p->height, p);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "client"))
|
|
|
|
{ // draw a deathmatch client block
|
|
|
|
int score, ping, time;
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
x = sbar_rect.width/2 - 160 + atoi(com_token);
|
|
|
|
s = COM_Parse (s);
|
|
|
|
y = sbar_rect.height/2 - 120 + atoi(com_token);
|
|
|
|
// SCR_AddDirtyPoint (x, y);
|
|
|
|
// SCR_AddDirtyPoint (x+159, y+31);
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
value = atoi(com_token);
|
|
|
|
if (value >= MAX_CLIENTS || value < 0)
|
|
|
|
Host_EndGame ("client >= MAX_CLIENTS");
|
|
|
|
// ci = &cl.clientinfo[value];
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
score = atoi(com_token);
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
ping = atoi(com_token);
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
time = atoi(com_token);
|
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
Draw_AltFunString (x+32, y, cl.players[value].name);
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x+32, y+8, "Score: ");
|
|
|
|
Draw_AltFunString (x+32+7*8, y+8, va("%i", score));
|
|
|
|
Draw_FunString (x+32, y+16, va("Ping: %i", ping));
|
|
|
|
Draw_FunString (x+32, y+24, va("Time: %i", time));
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// if (!ci->icon)
|
|
|
|
// ci = &cl.baseclientinfo;
|
2011-03-31 01:14:01 +00:00
|
|
|
// Draw_Pic (x, y, R2D_SafeCachePic(ci->iconname));
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "ctf"))
|
|
|
|
{ // draw a ctf client block
|
|
|
|
int score, ping;
|
|
|
|
char block[80];
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
x = sbar_rect.width/2 - 160 + atoi(com_token);
|
|
|
|
s = COM_Parse (s);
|
|
|
|
y = sbar_rect.height/2 - 120 + atoi(com_token);
|
|
|
|
// SCR_AddDirtyPoint (x, y);
|
|
|
|
// SCR_AddDirtyPoint (x+159, y+31);
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
value = atoi(com_token);
|
|
|
|
if (value >= MAX_CLIENTS || value < 0)
|
|
|
|
Host_EndGame ("client >= MAX_CLIENTS");
|
|
|
|
// ci = &cl.clientinfo[value];
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
score = atoi(com_token);
|
|
|
|
|
|
|
|
s = COM_Parse (s);
|
|
|
|
ping = atoi(com_token);
|
|
|
|
if (ping > 999)
|
|
|
|
ping = 999;
|
|
|
|
|
|
|
|
sprintf(block, "%3d %3d %-12.12s", score, ping, "Player"/*ci->name*/);
|
|
|
|
|
|
|
|
// if (value == cl.playernum)
|
|
|
|
// Draw_Alt_String (x, y, block);
|
|
|
|
// else
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x, y, block);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "picn"))
|
|
|
|
{ // draw a pic from a name
|
|
|
|
s = COM_Parse (s);
|
|
|
|
// SCR_AddDirtyPoint (x, y);
|
|
|
|
// SCR_AddDirtyPoint (x+23, y+23);
|
2010-07-11 02:22:39 +00:00
|
|
|
p = Sbar_Q2CachePic(com_token);
|
2009-11-04 21:16:50 +00:00
|
|
|
if (p)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic (x, y, p->width, p->height, p);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "num"))
|
|
|
|
{ // draw a number
|
|
|
|
s = COM_Parse (s);
|
|
|
|
width = atoi(com_token);
|
|
|
|
s = COM_Parse (s);
|
|
|
|
value = cl.q2frame.playerstate.stats[atoi(com_token)];
|
|
|
|
SCR_DrawField (x, y, 0, width, value);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "hnum"))
|
|
|
|
{ // health number
|
|
|
|
int color;
|
|
|
|
|
|
|
|
width = 3;
|
|
|
|
value = cl.q2frame.playerstate.stats[Q2STAT_HEALTH];
|
|
|
|
if (value > 25)
|
|
|
|
color = 0; // green
|
|
|
|
else if (value > 0)
|
|
|
|
color = (cl.q2frame.serverframe>>2) & 1; // flash
|
|
|
|
else
|
|
|
|
color = 1;
|
|
|
|
|
|
|
|
if (cl.q2frame.playerstate.stats[Q2STAT_FLASHES] & 1)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
2010-07-11 02:22:39 +00:00
|
|
|
p = Sbar_Q2CachePic("field_3");
|
2009-11-04 21:16:50 +00:00
|
|
|
if (p)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic (x, y, p->width, p->height, p);
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
SCR_DrawField (x, y, color, width, value);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "anum"))
|
|
|
|
{ // ammo number
|
|
|
|
int color;
|
|
|
|
|
|
|
|
width = 3;
|
|
|
|
value = cl.q2frame.playerstate.stats[Q2STAT_AMMO];
|
|
|
|
if (value > 5)
|
|
|
|
color = 0; // green
|
|
|
|
else if (value >= 0)
|
|
|
|
color = (cl.q2frame.serverframe>>2) & 1; // flash
|
|
|
|
else
|
|
|
|
continue; // negative number = don't show
|
|
|
|
|
|
|
|
if (cl.q2frame.playerstate.stats[Q2STAT_FLASHES] & 4)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
2010-07-11 02:22:39 +00:00
|
|
|
p = Sbar_Q2CachePic("field_3");
|
2009-11-04 21:16:50 +00:00
|
|
|
if (p)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic (x, y, p->width, p->height, p);
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
SCR_DrawField (x, y, color, width, value);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "rnum"))
|
|
|
|
{ // armor number
|
|
|
|
int color;
|
|
|
|
|
|
|
|
width = 3;
|
|
|
|
value = cl.q2frame.playerstate.stats[Q2STAT_ARMOR];
|
|
|
|
if (value < 1)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
color = 0; // green
|
|
|
|
|
|
|
|
if (cl.q2frame.playerstate.stats[Q2STAT_FLASHES] & 2)
|
2011-10-27 15:46:36 +00:00
|
|
|
R2D_ScalePic (x, y, 64, 64, R2D_SafeCachePic("field_3"));
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
SCR_DrawField (x, y, color, width, value);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "stat_string"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
|
|
|
index = atoi(com_token);
|
|
|
|
if (index < 0 || index >= Q2MAX_CONFIGSTRINGS)
|
|
|
|
Host_EndGame ("Bad stat_string index");
|
|
|
|
index = cl.q2frame.playerstate.stats[index];
|
|
|
|
if (index < 0 || index >= Q2MAX_CONFIGSTRINGS)
|
|
|
|
Host_EndGame ("Bad stat_string index");
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x, y, Get_Q2ConfigString(index));
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "cstring"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2010-07-11 02:22:39 +00:00
|
|
|
DrawHUDString (com_token, x, y, 320, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "string"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x, y, com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "cstring2"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2010-07-11 02:22:39 +00:00
|
|
|
DrawHUDString (com_token, x, y, 320, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "string2"))
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_AltFunString (x, y, com_token);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(com_token, "if"))
|
|
|
|
{ // draw a number
|
|
|
|
s = COM_Parse (s);
|
|
|
|
value = cl.q2frame.playerstate.stats[atoi(com_token)];
|
|
|
|
if (!value)
|
|
|
|
{ // skip to endif
|
|
|
|
while (s && strcmp(com_token, "endif") )
|
|
|
|
{
|
|
|
|
s = COM_Parse (s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_ShowTeamScores
|
|
|
|
|
|
|
|
Tab key down
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
void Sbar_ShowTeamScores (void)
|
|
|
|
{
|
|
|
|
if (sb_showteamscores)
|
|
|
|
return;
|
|
|
|
|
2005-10-16 03:57:01 +00:00
|
|
|
#ifdef CSQC_DAT
|
|
|
|
if (CSQC_ConsoleCommand(Cmd_Argv(0)))
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
sb_showteamscores = true;
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_DontShowTeamScores
|
|
|
|
|
|
|
|
Tab key up
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
void Sbar_DontShowTeamScores (void)
|
|
|
|
{
|
|
|
|
sb_showteamscores = false;
|
|
|
|
sb_updates = 0;
|
2005-10-16 03:57:01 +00:00
|
|
|
|
|
|
|
#ifdef CSQC_DAT
|
|
|
|
if (CSQC_ConsoleCommand(Cmd_Argv(0)))
|
|
|
|
return;
|
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_ShowScores
|
|
|
|
|
|
|
|
Tab key down
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
void Sbar_ShowScores (void)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_teamscores.ival)
|
2007-10-02 16:00:38 +00:00
|
|
|
{
|
|
|
|
Sbar_ShowTeamScores();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (sb_showscores)
|
|
|
|
return;
|
|
|
|
|
2005-10-16 03:57:01 +00:00
|
|
|
#ifdef CSQC_DAT
|
|
|
|
if (CSQC_ConsoleCommand(Cmd_Argv(0)))
|
|
|
|
return;
|
|
|
|
#endif
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
sb_showscores = true;
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
void Sbar_Hexen2InvLeft_f(void)
|
|
|
|
{
|
2011-04-23 20:37:20 +00:00
|
|
|
if (cls.protocol == CP_QUAKE2)
|
2010-08-28 17:14:38 +00:00
|
|
|
{
|
2011-04-23 20:37:20 +00:00
|
|
|
CL_SendClientCommand(true, "invprev");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int tries = 15;
|
|
|
|
int pnum = CL_TargettedSplit(false);
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[pnum];
|
|
|
|
pv->sb_hexen2_item_time = realtime;
|
2011-04-23 20:37:20 +00:00
|
|
|
while (tries-- > 0)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
pv->sb_hexen2_cur_item--;
|
|
|
|
if (pv->sb_hexen2_cur_item < 0)
|
|
|
|
pv->sb_hexen2_cur_item = 14;
|
2010-08-28 17:14:38 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_CNT_TORCH+pv->sb_hexen2_cur_item] > 0)
|
2011-04-23 20:37:20 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-08-28 17:14:38 +00:00
|
|
|
}
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
void Sbar_Hexen2InvRight_f(void)
|
|
|
|
{
|
2011-04-23 20:37:20 +00:00
|
|
|
if (cls.protocol == CP_QUAKE2)
|
|
|
|
{
|
|
|
|
CL_SendClientCommand(true, "invnext");
|
|
|
|
}
|
|
|
|
else
|
2010-08-28 17:14:38 +00:00
|
|
|
{
|
2011-04-23 20:37:20 +00:00
|
|
|
int tries = 15;
|
|
|
|
int pnum = CL_TargettedSplit(false);
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[pnum];
|
|
|
|
pv->sb_hexen2_item_time = realtime;
|
2011-04-23 20:37:20 +00:00
|
|
|
while (tries-- > 0)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
pv->sb_hexen2_cur_item++;
|
|
|
|
if (pv->sb_hexen2_cur_item > 14)
|
|
|
|
pv->sb_hexen2_cur_item = 0;
|
2010-08-28 17:14:38 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_CNT_TORCH+pv->sb_hexen2_cur_item] > 0)
|
2011-04-23 20:37:20 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-08-28 17:14:38 +00:00
|
|
|
}
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
void Sbar_Hexen2InvUse_f(void)
|
|
|
|
{
|
2011-04-23 20:37:20 +00:00
|
|
|
if (cls.protocol == CP_QUAKE2)
|
|
|
|
{
|
|
|
|
CL_SendClientCommand(true, "invuse");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int pnum = CL_TargettedSplit(false);
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[pnum];
|
|
|
|
Cmd_ExecuteString(va("impulse %d\n", 100+pv->sb_hexen2_cur_item), Cmd_ExecLevel);
|
2011-04-23 20:37:20 +00:00
|
|
|
}
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
void Sbar_Hexen2ShowInfo_f(void)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[CL_TargettedSplit(false)];
|
|
|
|
pv->sb_hexen2_extra_info = true;
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
void Sbar_Hexen2DontShowInfo_f(void)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[CL_TargettedSplit(false)];
|
|
|
|
pv->sb_hexen2_extra_info = false;
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
2010-08-16 02:03:02 +00:00
|
|
|
void Sbar_Hexen2PInfoPlaque_f(void)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[CL_TargettedSplit(false)];
|
|
|
|
pv->sb_hexen2_infoplaque = true;
|
2010-08-16 02:03:02 +00:00
|
|
|
}
|
|
|
|
void Sbar_Hexen2MInfoPlaque_f(void)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = &cl.playerview[CL_TargettedSplit(false)];
|
|
|
|
pv->sb_hexen2_infoplaque = false;
|
2010-08-16 02:03:02 +00:00
|
|
|
}
|
2008-06-01 22:06:22 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_DontShowScores
|
|
|
|
|
|
|
|
Tab key up
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
void Sbar_DontShowScores (void)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_teamscores.ival)
|
2007-10-02 16:00:38 +00:00
|
|
|
{
|
|
|
|
Sbar_DontShowTeamScores();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
sb_showscores = false;
|
|
|
|
sb_updates = 0;
|
2005-10-16 03:57:01 +00:00
|
|
|
|
|
|
|
#ifdef CSQC_DAT
|
|
|
|
if (CSQC_ConsoleCommand(Cmd_Argv(0)))
|
|
|
|
return;
|
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_Changed
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
void Sbar_Changed (void)
|
|
|
|
{
|
|
|
|
sb_updates = 0; // update next frame
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_Init
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
|
|
|
|
qboolean sbar_loaded;
|
|
|
|
|
|
|
|
char *failedpic;
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *Sbar_PicFromWad(char *name)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *ret;
|
2011-03-31 01:14:01 +00:00
|
|
|
ret = R2D_SafePicFromWad(name);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
failedpic = name;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
void Sbar_Flush (void)
|
|
|
|
{
|
|
|
|
sbar_loaded = false;
|
|
|
|
}
|
|
|
|
void Sbar_Start (void) //if one of these fails, skip the entire status bar.
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (sbar_loaded)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sbar_loaded = true;
|
|
|
|
|
|
|
|
if (!wad_base) //the wad isn't loaded. This is an indication that it doesn't exist.
|
|
|
|
{
|
|
|
|
sbarfailed = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
failedpic = NULL;
|
|
|
|
|
|
|
|
sbarfailed = false;
|
|
|
|
|
|
|
|
for (i=0 ; i<10 ; i++)
|
|
|
|
{
|
|
|
|
sb_nums[0][i] = Sbar_PicFromWad (va("num_%i",i));
|
|
|
|
sb_nums[1][i] = Sbar_PicFromWad (va("anum_%i",i));
|
|
|
|
}
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
if (sb_nums[0][0] && sb_nums[0][0]->width < 13)
|
|
|
|
sbar_hexen2 = true;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
sb_nums[0][10] = Sbar_PicFromWad ("num_minus");
|
|
|
|
sb_nums[1][10] = Sbar_PicFromWad ("anum_minus");
|
|
|
|
|
|
|
|
sb_colon = Sbar_PicFromWad ("num_colon");
|
|
|
|
sb_slash = Sbar_PicFromWad ("num_slash");
|
|
|
|
|
|
|
|
sb_weapons[0][0] = Sbar_PicFromWad ("inv_shotgun");
|
|
|
|
sb_weapons[0][1] = Sbar_PicFromWad ("inv_sshotgun");
|
|
|
|
sb_weapons[0][2] = Sbar_PicFromWad ("inv_nailgun");
|
|
|
|
sb_weapons[0][3] = Sbar_PicFromWad ("inv_snailgun");
|
|
|
|
sb_weapons[0][4] = Sbar_PicFromWad ("inv_rlaunch");
|
|
|
|
sb_weapons[0][5] = Sbar_PicFromWad ("inv_srlaunch");
|
|
|
|
sb_weapons[0][6] = Sbar_PicFromWad ("inv_lightng");
|
|
|
|
|
|
|
|
sb_weapons[1][0] = Sbar_PicFromWad ("inv2_shotgun");
|
|
|
|
sb_weapons[1][1] = Sbar_PicFromWad ("inv2_sshotgun");
|
|
|
|
sb_weapons[1][2] = Sbar_PicFromWad ("inv2_nailgun");
|
|
|
|
sb_weapons[1][3] = Sbar_PicFromWad ("inv2_snailgun");
|
|
|
|
sb_weapons[1][4] = Sbar_PicFromWad ("inv2_rlaunch");
|
|
|
|
sb_weapons[1][5] = Sbar_PicFromWad ("inv2_srlaunch");
|
|
|
|
sb_weapons[1][6] = Sbar_PicFromWad ("inv2_lightng");
|
|
|
|
|
|
|
|
for (i=0 ; i<5 ; i++)
|
|
|
|
{
|
|
|
|
sb_weapons[2+i][0] = Sbar_PicFromWad (va("inva%i_shotgun",i+1));
|
|
|
|
sb_weapons[2+i][1] = Sbar_PicFromWad (va("inva%i_sshotgun",i+1));
|
|
|
|
sb_weapons[2+i][2] = Sbar_PicFromWad (va("inva%i_nailgun",i+1));
|
|
|
|
sb_weapons[2+i][3] = Sbar_PicFromWad (va("inva%i_snailgun",i+1));
|
|
|
|
sb_weapons[2+i][4] = Sbar_PicFromWad (va("inva%i_rlaunch",i+1));
|
|
|
|
sb_weapons[2+i][5] = Sbar_PicFromWad (va("inva%i_srlaunch",i+1));
|
|
|
|
sb_weapons[2+i][6] = Sbar_PicFromWad (va("inva%i_lightng",i+1));
|
|
|
|
}
|
|
|
|
|
|
|
|
sb_ammo[0] = Sbar_PicFromWad ("sb_shells");
|
|
|
|
sb_ammo[1] = Sbar_PicFromWad ("sb_nails");
|
|
|
|
sb_ammo[2] = Sbar_PicFromWad ("sb_rocket");
|
|
|
|
sb_ammo[3] = Sbar_PicFromWad ("sb_cells");
|
|
|
|
|
|
|
|
sb_armor[0] = Sbar_PicFromWad ("sb_armor1");
|
|
|
|
sb_armor[1] = Sbar_PicFromWad ("sb_armor2");
|
|
|
|
sb_armor[2] = Sbar_PicFromWad ("sb_armor3");
|
|
|
|
|
|
|
|
sb_items[0] = Sbar_PicFromWad ("sb_key1");
|
|
|
|
sb_items[1] = Sbar_PicFromWad ("sb_key2");
|
|
|
|
sb_items[2] = Sbar_PicFromWad ("sb_invis");
|
|
|
|
sb_items[3] = Sbar_PicFromWad ("sb_invuln");
|
|
|
|
sb_items[4] = Sbar_PicFromWad ("sb_suit");
|
|
|
|
sb_items[5] = Sbar_PicFromWad ("sb_quad");
|
|
|
|
|
|
|
|
sb_sigil[0] = Sbar_PicFromWad ("sb_sigil1");
|
|
|
|
sb_sigil[1] = Sbar_PicFromWad ("sb_sigil2");
|
|
|
|
sb_sigil[2] = Sbar_PicFromWad ("sb_sigil3");
|
|
|
|
sb_sigil[3] = Sbar_PicFromWad ("sb_sigil4");
|
|
|
|
|
|
|
|
sb_faces[4][0] = Sbar_PicFromWad ("face1");
|
|
|
|
sb_faces[4][1] = Sbar_PicFromWad ("face_p1");
|
|
|
|
sb_faces[3][0] = Sbar_PicFromWad ("face2");
|
|
|
|
sb_faces[3][1] = Sbar_PicFromWad ("face_p2");
|
|
|
|
sb_faces[2][0] = Sbar_PicFromWad ("face3");
|
|
|
|
sb_faces[2][1] = Sbar_PicFromWad ("face_p3");
|
|
|
|
sb_faces[1][0] = Sbar_PicFromWad ("face4");
|
|
|
|
sb_faces[1][1] = Sbar_PicFromWad ("face_p4");
|
|
|
|
sb_faces[0][0] = Sbar_PicFromWad ("face5");
|
|
|
|
sb_faces[0][1] = Sbar_PicFromWad ("face_p5");
|
|
|
|
|
|
|
|
sb_face_invis = Sbar_PicFromWad ("face_invis");
|
|
|
|
sb_face_invuln = Sbar_PicFromWad ("face_invul2");
|
|
|
|
sb_face_invis_invuln = Sbar_PicFromWad ("face_inv2");
|
|
|
|
sb_face_quad = Sbar_PicFromWad ("face_quad");
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
sb_sbar = Sbar_PicFromWad ("sbar");
|
|
|
|
sb_ibar = Sbar_PicFromWad ("ibar");
|
|
|
|
sb_scorebar = Sbar_PicFromWad ("scorebar");
|
|
|
|
|
|
|
|
if (failedpic)
|
|
|
|
sbarfailed = true;
|
|
|
|
failedpic = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//try to detect rogue wads, and thus the stats we will be getting from the server.
|
|
|
|
failedpic = NULL;
|
|
|
|
|
|
|
|
rsb_invbar[0] = Sbar_PicFromWad ("r_invbar1");
|
|
|
|
rsb_invbar[1] = Sbar_PicFromWad ("r_invbar2");
|
|
|
|
|
|
|
|
rsb_weapons[0] = Sbar_PicFromWad ("r_lava");
|
|
|
|
rsb_weapons[1] = Sbar_PicFromWad ("r_superlava");
|
|
|
|
rsb_weapons[2] = Sbar_PicFromWad ("r_gren");
|
|
|
|
rsb_weapons[3] = Sbar_PicFromWad ("r_multirock");
|
|
|
|
rsb_weapons[4] = Sbar_PicFromWad ("r_plasma");
|
|
|
|
|
|
|
|
rsb_items[0] = Sbar_PicFromWad ("r_shield1");
|
|
|
|
rsb_items[1] = Sbar_PicFromWad ("r_agrav1");
|
|
|
|
|
|
|
|
rsb_teambord = Sbar_PicFromWad ("r_teambord");
|
|
|
|
|
|
|
|
rsb_ammo[0] = Sbar_PicFromWad ("r_ammolava");
|
|
|
|
rsb_ammo[1] = Sbar_PicFromWad ("r_ammomulti");
|
|
|
|
rsb_ammo[2] = Sbar_PicFromWad ("r_ammoplasma");
|
|
|
|
|
|
|
|
if (!failedpic || COM_CheckParm("-rogue"))
|
|
|
|
sbar_rogue = true;
|
|
|
|
else
|
|
|
|
sbar_rogue = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Sbar_Init (void)
|
|
|
|
{
|
2007-07-23 18:52:11 +00:00
|
|
|
Cvar_Register(&scr_scoreboard_drawtitle, "Scoreboard settings");
|
2007-10-02 16:00:38 +00:00
|
|
|
Cvar_Register(&scr_scoreboard_forcecolors, "Scoreboard settings");
|
|
|
|
Cvar_Register(&scr_scoreboard_newstyle, "Scoreboard settings");
|
2007-07-23 18:52:11 +00:00
|
|
|
Cvar_Register(&scr_scoreboard_showfrags, "Scoreboard settings");
|
2007-10-02 16:00:38 +00:00
|
|
|
Cvar_Register(&scr_scoreboard_teamscores, "Scoreboard settings");
|
2007-07-23 18:52:11 +00:00
|
|
|
Cvar_Register(&scr_scoreboard_titleseperator, "Scoreboard settings");
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
Cvar_Register(&sbar_teamstatus, "Status bar settings");
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
Cmd_AddCommand ("+showscores", Sbar_ShowScores);
|
|
|
|
Cmd_AddCommand ("-showscores", Sbar_DontShowScores);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
Cmd_AddCommand ("+showteamscores", Sbar_ShowTeamScores);
|
|
|
|
Cmd_AddCommand ("-showteamscores", Sbar_DontShowTeamScores);
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
//stuff to get hexen2 working out-of-the-box
|
|
|
|
Cmd_AddCommand ("invleft", Sbar_Hexen2InvLeft_f);
|
|
|
|
Cmd_AddCommand ("invright", Sbar_Hexen2InvRight_f);
|
2011-04-23 20:37:20 +00:00
|
|
|
Cmd_AddCommand ("invprev", Sbar_Hexen2InvLeft_f);
|
|
|
|
Cmd_AddCommand ("invnext", Sbar_Hexen2InvRight_f);
|
2008-06-01 22:06:22 +00:00
|
|
|
Cmd_AddCommand ("invuse", Sbar_Hexen2InvUse_f);
|
|
|
|
Cmd_AddCommand ("+showinfo", Sbar_Hexen2ShowInfo_f);
|
|
|
|
Cmd_AddCommand ("-showinfo", Sbar_Hexen2DontShowInfo_f);
|
2010-08-16 02:03:02 +00:00
|
|
|
Cmd_AddCommand ("+infoplaque", Sbar_Hexen2PInfoPlaque_f);
|
|
|
|
Cmd_AddCommand ("-infoplaque", Sbar_Hexen2MInfoPlaque_f);
|
2008-06-01 22:06:22 +00:00
|
|
|
Cbuf_AddText("alias +crouch \"impulse 22\"\n", RESTRICT_LOCAL);
|
|
|
|
Cbuf_AddText("alias -crouch \"impulse 22\"\n", RESTRICT_LOCAL);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
// drawing routines are reletive to the status bar location
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
Sbar_DrawPic
|
|
|
|
=============
|
|
|
|
*/
|
2009-11-04 21:16:50 +00:00
|
|
|
void Sbar_DrawPic (int x, int y, int w, int h, mpic_t *pic)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic(sbar_rect.x + x /* + ((sbar_rect.width - 320)>>1) */, sbar_rect.y + y + (sbar_rect.height-SBAR_HEIGHT), w, h, pic);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
Sbar_DrawSubPic
|
|
|
|
=============
|
|
|
|
JACK: Draws a portion of the picture in the status bar.
|
|
|
|
*/
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
void Sbar_DrawSubPic(int x, int y, int width, int height, mpic_t *pic, int srcx, int srcy, int srcwidth, int srcheight)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_SubPic (sbar_rect.x + x, sbar_rect.y + y+(sbar_rect.height-SBAR_HEIGHT), width, height, pic, srcx, srcy, srcwidth, srcheight);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
Sbar_DrawCharacter
|
|
|
|
|
|
|
|
Draws one solid graphics character
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
void Sbar_DrawCharacter (int x, int y, int num)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_BeginString(font_conchar, sbar_rect.x + x + 4, sbar_rect.y + y + sbar_rect.height-SBAR_HEIGHT, &x, &y);
|
|
|
|
Font_DrawChar(x, y, num | 0xe000 | CON_WHITEMASK);
|
|
|
|
Font_EndString(font_conchar);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
Sbar_DrawString
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
void Sbar_DrawString (int x, int y, char *str)
|
2005-09-14 04:10:44 +00:00
|
|
|
{
|
|
|
|
Draw_FunString (sbar_rect.x + x /*+ ((sbar_rect.width - 320)>>1) */, sbar_rect.y + y+ sbar_rect.height-SBAR_HEIGHT, str);
|
|
|
|
}
|
|
|
|
|
2010-08-28 17:14:38 +00:00
|
|
|
void Sbar_DrawExpandedString (int x, int y, conchar_t *str)
|
|
|
|
{
|
|
|
|
Draw_ExpandedString (sbar_rect.x + x /*+ ((sbar_rect.width - 320)>>1) */, sbar_rect.y + y+ sbar_rect.height-SBAR_HEIGHT, str);
|
|
|
|
}
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
void Draw_TinyString (int x, int y, const qbyte *str)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
float xstart;
|
|
|
|
|
|
|
|
if (!font_tiny)
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
{
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
font_tiny = Font_LoadFont(6, "gfx/tinyfont");
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (!font_tiny)
|
|
|
|
return;
|
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
|
|
|
|
Font_BeginString(font_tiny, x, y, &x, &y);
|
|
|
|
xstart = x;
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
while (*str)
|
|
|
|
{
|
|
|
|
if (*str == '\n')
|
|
|
|
{
|
|
|
|
x = xstart;
|
2009-11-04 21:16:50 +00:00
|
|
|
y += Font_CharHeight();
|
2008-06-01 22:06:22 +00:00
|
|
|
str++;
|
|
|
|
continue;
|
|
|
|
}
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
x = Font_DrawChar(x, y, CON_WHITEMASK|*str++);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_EndString(font_tiny);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
void Sbar_DrawTinyString (int x, int y, char *str)
|
|
|
|
{
|
|
|
|
Draw_TinyString (sbar_rect.x + x /*+ ((sbar_rect.width - 320)>>1) */, sbar_rect.y + y+ sbar_rect.height-SBAR_HEIGHT, str);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Sbar_FillPC (int x, int y, int w, int h, unsigned int pcolour)
|
|
|
|
{
|
|
|
|
if (pcolour >= 16)
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImageColours (((pcolour&0xff0000)>>16)/255.0f, ((pcolour&0xff00)>>8)/255.0f, (pcolour&0xff)/255.0f, 1.0);
|
|
|
|
R2D_FillBlock (x, y, w, h);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour(Sbar_ColorForMap(pcolour), 1.0);
|
|
|
|
R2D_FillBlock (x, y, w, h);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
static void Sbar_FillPCDark (int x, int y, int w, int h, unsigned int pcolour)
|
|
|
|
{
|
|
|
|
if (pcolour >= 16)
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImageColours (((pcolour&0xff0000)>>16)/1024.0f, ((pcolour&0xff00)>>8)/1024.0f, (pcolour&0xff)/1024.0f, 1.0);
|
|
|
|
R2D_FillBlock (x, y, w, h);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour(Sbar_ColorForMap(pcolour)-1, 1.0);
|
|
|
|
R2D_FillBlock (x, y, w, h);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
=============
|
|
|
|
Sbar_itoa
|
|
|
|
=============
|
|
|
|
*/
|
|
|
|
int Sbar_itoa (int num, char *buf)
|
|
|
|
{
|
|
|
|
char *str;
|
|
|
|
int pow10;
|
|
|
|
int dig;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
str = buf;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (num < 0)
|
|
|
|
{
|
|
|
|
*str++ = '-';
|
|
|
|
num = -num;
|
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
for (pow10 = 10 ; num >= pow10 ; pow10 *= 10)
|
|
|
|
;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
pow10 /= 10;
|
|
|
|
dig = num/pow10;
|
|
|
|
*str++ = '0'+dig;
|
|
|
|
num -= dig*pow10;
|
|
|
|
} while (pow10 != 1);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
*str = 0;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
return str-buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
Sbar_DrawNum
|
|
|
|
=============
|
|
|
|
*/
|
|
|
|
void Sbar_DrawNum (int x, int y, int num, int digits, int color)
|
|
|
|
{
|
|
|
|
char str[12];
|
|
|
|
char *ptr;
|
|
|
|
int l, frame;
|
|
|
|
#undef small
|
|
|
|
int small=false;
|
|
|
|
|
|
|
|
if (digits < 0)
|
|
|
|
{
|
|
|
|
small = true;
|
|
|
|
digits*=-1;
|
|
|
|
}
|
|
|
|
|
|
|
|
l = Sbar_itoa (num, str);
|
|
|
|
ptr = str;
|
|
|
|
if (l > digits)
|
|
|
|
ptr += (l-digits);
|
|
|
|
|
|
|
|
if (small)
|
|
|
|
{
|
|
|
|
if (l < digits)
|
|
|
|
x += (digits-l)*8;
|
|
|
|
while (*ptr)
|
|
|
|
{
|
|
|
|
Sbar_DrawCharacter(x, y, *ptr+18 - '0');
|
|
|
|
ptr++;
|
|
|
|
x+=8;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (l < digits)
|
|
|
|
x += (digits-l)*24;
|
|
|
|
|
|
|
|
while (*ptr)
|
|
|
|
{
|
|
|
|
if (*ptr == '-')
|
|
|
|
frame = STAT_MINUS;
|
|
|
|
else
|
|
|
|
frame = *ptr -'0';
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (x, y, 24, 24, sb_nums[color][frame]);
|
2004-08-23 00:15:46 +00:00
|
|
|
x += 24;
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
void Sbar_Hexen2DrawNum (int x, int y, int num, int digits)
|
|
|
|
{
|
|
|
|
char str[12];
|
|
|
|
char *ptr;
|
|
|
|
int l, frame;
|
|
|
|
|
|
|
|
l = Sbar_itoa (num, str);
|
|
|
|
ptr = str;
|
|
|
|
if (l > digits)
|
|
|
|
ptr += (l-digits);
|
|
|
|
|
|
|
|
//hexen2 hud has it centered
|
|
|
|
if (l < digits)
|
|
|
|
x += ((digits-l)*13)/2;
|
|
|
|
|
|
|
|
while (*ptr)
|
|
|
|
{
|
|
|
|
if (*ptr == '-')
|
|
|
|
frame = STAT_MINUS;
|
|
|
|
else
|
|
|
|
frame = *ptr -'0';
|
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
Sbar_DrawPic (x, y, 12, 16, sb_nums[0][frame]);
|
2008-06-01 22:06:22 +00:00
|
|
|
x += 13;
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
int fragsort[MAX_CLIENTS];
|
2010-11-21 03:39:12 +00:00
|
|
|
int playerteam[MAX_CLIENTS];
|
2004-08-23 00:15:46 +00:00
|
|
|
int scoreboardlines;
|
|
|
|
typedef struct {
|
|
|
|
char team[16+1];
|
|
|
|
int frags;
|
|
|
|
int players;
|
|
|
|
int plow, phigh, ptotal;
|
2007-07-23 18:52:11 +00:00
|
|
|
int topcolour, bottomcolour;
|
|
|
|
qboolean ownteam;
|
2004-08-23 00:15:46 +00:00
|
|
|
} team_t;
|
|
|
|
team_t teams[MAX_CLIENTS];
|
|
|
|
int teamsort[MAX_CLIENTS];
|
|
|
|
int scoreboardteams;
|
|
|
|
|
2010-11-21 03:39:12 +00:00
|
|
|
struct
|
|
|
|
{
|
|
|
|
unsigned char upper;
|
|
|
|
short frags;
|
|
|
|
} nqteam[14];
|
|
|
|
void Sbar_PQ_Team_New(unsigned int lower, unsigned int upper)
|
|
|
|
{
|
|
|
|
if (lower >= 14)
|
|
|
|
return;
|
|
|
|
nqteam[lower].upper = upper;
|
|
|
|
}
|
|
|
|
void Sbar_PQ_Team_Frags(unsigned int lower, int frags)
|
|
|
|
{
|
|
|
|
if (lower >= 14)
|
|
|
|
return;
|
|
|
|
nqteam[lower].frags = frags;
|
|
|
|
}
|
|
|
|
void Sbar_PQ_Team_Reset(void)
|
|
|
|
{
|
|
|
|
memset(nqteam, 0, sizeof(nqteam));
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_SortFrags
|
|
|
|
===============
|
|
|
|
*/
|
2010-11-21 03:39:12 +00:00
|
|
|
void Sbar_SortFrags (qboolean includespec, qboolean teamsort)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i, j, k;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2010-11-21 03:39:12 +00:00
|
|
|
if (!cl.teamplay)
|
|
|
|
teamsort = false;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// sort by frags
|
|
|
|
scoreboardlines = 0;
|
|
|
|
for (i=0 ; i<MAX_CLIENTS ; i++)
|
|
|
|
{
|
|
|
|
if (cl.players[i].name[0] &&
|
|
|
|
(!cl.players[i].spectator || includespec))
|
|
|
|
{
|
|
|
|
fragsort[scoreboardlines] = i;
|
|
|
|
scoreboardlines++;
|
|
|
|
if (cl.players[i].spectator)
|
|
|
|
cl.players[i].frags = -999;
|
|
|
|
}
|
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
for (i=0 ; i<scoreboardlines ; i++)
|
|
|
|
for (j=0 ; j<scoreboardlines-1-i ; j++)
|
2010-11-21 03:39:12 +00:00
|
|
|
{
|
|
|
|
int t1 = playerteam[fragsort[j]];
|
|
|
|
int t2 = playerteam[fragsort[j+1]];
|
|
|
|
if (!teamsort || t1 == t2)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2010-11-21 03:39:12 +00:00
|
|
|
if (cl.players[fragsort[j]].frags < cl.players[fragsort[j+1]].frags)
|
|
|
|
{
|
|
|
|
k = fragsort[j];
|
|
|
|
fragsort[j] = fragsort[j+1];
|
|
|
|
fragsort[j+1] = k;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2010-11-21 03:39:12 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (t1 == -1)
|
|
|
|
t1 = MAX_CLIENTS;
|
|
|
|
if (t2 == -1)
|
|
|
|
t2 = MAX_CLIENTS;
|
|
|
|
if (t1 > t2)
|
|
|
|
{
|
|
|
|
k = fragsort[j];
|
|
|
|
fragsort[j] = fragsort[j+1];
|
|
|
|
fragsort[j+1] = k;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_SortTeams (playerview_t *pv)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i, j, k;
|
|
|
|
player_info_t *s;
|
|
|
|
char t[16+1];
|
2007-07-23 18:52:11 +00:00
|
|
|
int ownnum;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// request new ping times every two second
|
|
|
|
scoreboardteams = 0;
|
|
|
|
|
|
|
|
if (!cl.teamplay)
|
|
|
|
return;
|
|
|
|
|
|
|
|
memset(teams, 0, sizeof(teams));
|
2010-11-21 03:39:12 +00:00
|
|
|
// sort the teams
|
2004-08-23 00:15:46 +00:00
|
|
|
for (i = 0; i < MAX_CLIENTS; i++)
|
|
|
|
teams[i].plow = 999;
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
ownnum = Sbar_PlayerNum(pv);
|
2007-07-23 18:52:11 +00:00
|
|
|
|
|
|
|
for (i = 0; i < MAX_CLIENTS; i++)
|
|
|
|
{
|
2010-11-21 03:39:12 +00:00
|
|
|
playerteam[i] = -1;
|
2004-08-23 00:15:46 +00:00
|
|
|
s = &cl.players[i];
|
2007-07-23 18:52:11 +00:00
|
|
|
if (!s->name[0] || s->spectator)
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// find his team in the list
|
2005-11-01 23:25:15 +00:00
|
|
|
Q_strncpyz(t, s->team, sizeof(t));
|
|
|
|
if (!t[0])
|
2004-08-23 00:15:46 +00:00
|
|
|
continue; // not on team
|
2010-11-21 03:39:12 +00:00
|
|
|
if (cls.protocol == CP_NETQUAKE)
|
|
|
|
{
|
|
|
|
k = Sbar_BottomColour(s);
|
|
|
|
if (!k) //team 0 = spectator
|
|
|
|
continue;
|
|
|
|
for (j = 0; j < scoreboardteams; j++)
|
|
|
|
if (teams[j].bottomcolour == k)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (j = 0; j < scoreboardteams; j++)
|
|
|
|
if (!strcmp(teams[j].team, t))
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
|
|
|
|
/*if (cl.teamfortress)
|
|
|
|
{
|
|
|
|
teams[j].topcolour = teams[j].bottomcolour = TF_TeamToColour(t);
|
|
|
|
}
|
|
|
|
else*/ if (j == scoreboardteams || i == ownnum)
|
|
|
|
{
|
|
|
|
teams[j].topcolour = Sbar_TopColour(s);
|
|
|
|
teams[j].bottomcolour = Sbar_BottomColour(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (j == scoreboardteams)
|
|
|
|
{ // create a team for this player
|
|
|
|
scoreboardteams++;
|
2004-08-23 00:15:46 +00:00
|
|
|
strcpy(teams[j].team, t);
|
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
|
2010-11-21 03:39:12 +00:00
|
|
|
playerteam[i] = j;
|
2007-07-23 18:52:11 +00:00
|
|
|
teams[j].frags += s->frags;
|
|
|
|
teams[j].players++;
|
|
|
|
|
|
|
|
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;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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++)
|
2007-07-23 18:52:11 +00:00
|
|
|
if (teams[teamsort[i]].frags < teams[teamsort[j]].frags)
|
|
|
|
{
|
2004-08-23 00:15:46 +00:00
|
|
|
k = teamsort[i];
|
|
|
|
teamsort[i] = teamsort[j];
|
|
|
|
teamsort[j] = k;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
unsigned int Sbar_ColorForMap (unsigned int m)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-06-01 22:06:22 +00:00
|
|
|
if (m >= 16)
|
|
|
|
return m;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
m = (m < 0) ? 0 : ((m > 13) ? 13 : m);
|
|
|
|
|
|
|
|
m *= 16;
|
|
|
|
return m < 128 ? m + 8 : m + 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_SoloScoreboard
|
|
|
|
===============
|
|
|
|
*/
|
|
|
|
void Sbar_SoloScoreboard (void)
|
|
|
|
{
|
2007-03-04 19:17:16 +00:00
|
|
|
int l;
|
2004-08-23 00:15:46 +00:00
|
|
|
float time;
|
|
|
|
char str[80];
|
|
|
|
int minutes, seconds, tens, units;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 320, 24, sb_scorebar);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// time
|
2005-11-26 03:02:55 +00:00
|
|
|
time = cl.servertime;
|
2004-08-23 00:15:46 +00:00
|
|
|
minutes = time / 60;
|
|
|
|
seconds = time - 60*minutes;
|
|
|
|
tens = seconds / 10;
|
|
|
|
units = seconds - 10*tens;
|
|
|
|
sprintf (str,"Time :%3i:%i%i", minutes, tens, units);
|
|
|
|
Sbar_DrawString (184, 4, str);
|
2007-02-26 03:00:25 +00:00
|
|
|
|
|
|
|
// draw level name
|
|
|
|
l = strlen (cl.levelname);
|
|
|
|
Sbar_DrawString (232 - l*4, 12, cl.levelname);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void Sbar_CoopScoreboard (void)
|
|
|
|
{
|
|
|
|
float time;
|
|
|
|
char str[80];
|
|
|
|
int minutes, seconds, tens, units;
|
|
|
|
int l;
|
2012-07-05 19:42:36 +00:00
|
|
|
int pnum = 0; //doesn't matter, should all be the same
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
sprintf (str,"Monsters:%3i /%3i", cl.playerview[pnum].stats[STAT_MONSTERS], cl.playerview[pnum].stats[STAT_TOTALMONSTERS]);
|
2004-08-23 00:15:46 +00:00
|
|
|
Sbar_DrawString (8, 4, str);
|
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
sprintf (str,"Secrets :%3i /%3i", cl.playerview[pnum].stats[STAT_SECRETS], cl.playerview[pnum].stats[STAT_TOTALSECRETS]);
|
2004-08-23 00:15:46 +00:00
|
|
|
Sbar_DrawString (8, 12, str);
|
|
|
|
|
|
|
|
// time
|
2005-11-26 03:02:55 +00:00
|
|
|
time = cl.servertime;
|
2004-08-23 00:15:46 +00:00
|
|
|
minutes = time / 60;
|
|
|
|
seconds = time - 60*minutes;
|
|
|
|
tens = seconds / 10;
|
|
|
|
units = seconds - 10*tens;
|
|
|
|
sprintf (str,"Time :%3i:%i%i", minutes, tens, units);
|
|
|
|
Sbar_DrawString (184, 4, str);
|
|
|
|
|
|
|
|
// draw level name
|
|
|
|
l = strlen (cl.levelname);
|
|
|
|
Sbar_DrawString (232 - l*4, 12, cl.levelname);
|
|
|
|
}
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_DrawInventory
|
|
|
|
===============
|
|
|
|
*/
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_DrawInventory (playerview_t *pv)
|
2005-11-26 03:02:55 +00:00
|
|
|
{
|
2004-08-23 00:15:46 +00:00
|
|
|
int i;
|
2010-08-28 17:14:38 +00:00
|
|
|
char num[6];
|
|
|
|
conchar_t numc[6];
|
2004-08-23 00:15:46 +00:00
|
|
|
float time;
|
|
|
|
int flashon;
|
|
|
|
qboolean headsup;
|
|
|
|
qboolean hudswap;
|
|
|
|
|
|
|
|
headsup = !(cl_sbar.value || (scr_viewsize.value<100&&cl.splitclients==1));
|
|
|
|
hudswap = cl_hudswap.value; // Get that nasty float out :)
|
|
|
|
|
|
|
|
if (!headsup)
|
|
|
|
{
|
|
|
|
if (sbar_rogue)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if ( pv->stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN )
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawPic (0, -24, 320, 24, rsb_invbar[0]);
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawPic (0, -24, 320, 24, rsb_invbar[1]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, -24, 320, 24, sb_ibar);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
// weapons
|
|
|
|
for (i=0 ; i<7 ; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & (IT_SHOTGUN<<i) )
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
time = pv->item_gettime[i];
|
2004-08-23 00:15:46 +00:00
|
|
|
flashon = (int)((cl.time - time)*10);
|
|
|
|
if (flashon < 0)
|
|
|
|
flashon = 0;
|
|
|
|
if (flashon >= 10)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if ( pv->stats[STAT_ACTIVEWEAPON] == (IT_SHOTGUN<<i) )
|
2004-08-23 00:15:46 +00:00
|
|
|
flashon = 1;
|
|
|
|
else
|
|
|
|
flashon = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
flashon = (flashon%5) + 2;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (headsup)
|
|
|
|
{
|
2004-08-23 00:15:46 +00:00
|
|
|
if (i || sbar_rect.height>200)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawSubPic ((hudswap) ? 0 : (sbar_rect.width-24),-68-(7-i)*16, 24,16, sb_weapons[flashon][i],0,0,(i==6)?48:24, 16);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawPic (i*24, -16, (i==6)?48:24, 16, sb_weapons[flashon][i]);
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (flashon > 1)
|
|
|
|
sb_updates = 0; // force update to remove flash
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sbar_rogue)
|
|
|
|
{
|
|
|
|
// check for powered up weapon.
|
2013-06-23 02:17:02 +00:00
|
|
|
if ( pv->stats[STAT_ACTIVEWEAPON] >= RIT_LAVA_NAILGUN )
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
for (i=0;i<5;i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ACTIVEWEAPON] == (RIT_LAVA_NAILGUN << i))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-01-09 00:29:05 +00:00
|
|
|
if (headsup)
|
|
|
|
{
|
2004-10-03 22:13:30 +00:00
|
|
|
if (sbar_rect.height>200)
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawSubPic ((hudswap) ? 0 : (sbar_rect.width-24),-68-(5-i)*16, 24, 16, rsb_weapons[i],0,0,((i==4)?48:24),16);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2008-01-09 00:29:05 +00:00
|
|
|
}
|
|
|
|
else
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawPic ((i+2)*24, -16, (i==4)?48:24, 16, rsb_weapons[i]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ammo counts
|
2010-11-13 17:22:46 +00:00
|
|
|
if (headsup)
|
|
|
|
{
|
|
|
|
for (i=0 ; i<4 ; i++)
|
|
|
|
{
|
|
|
|
Sbar_DrawSubPic((hudswap) ? 0 : (sbar_rect.width-42), -24 - (4-i)*11, 42, 11, sb_ibar, 3+(i*48), 0, 320, 24);
|
|
|
|
}
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
for (i=0 ; i<4 ; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
snprintf (num, sizeof(num), "%3i", pv->stats[STAT_SHELLS+i] );
|
2010-08-28 17:14:38 +00:00
|
|
|
numc[0] = CON_WHITEMASK|0xe000|((num[0]!=' ')?(num[0] + 18-'0'):' ');
|
|
|
|
numc[1] = CON_WHITEMASK|0xe000|((num[1]!=' ')?(num[1] + 18-'0'):' ');
|
|
|
|
numc[2] = CON_WHITEMASK|0xe000|((num[2]!=' ')?(num[2] + 18-'0'):' ');
|
|
|
|
numc[3] = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (headsup)
|
|
|
|
{
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawExpandedString((hudswap) ? 3 : (sbar_rect.width-39), -24 - (4-i)*11, numc);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-08-28 17:14:38 +00:00
|
|
|
Sbar_DrawExpandedString((6*i+1)*8 - 2, -24, numc);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
flashon = 0;
|
|
|
|
// items
|
|
|
|
for (i=0 ; i<6 ; i++)
|
2008-01-09 00:29:05 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & (1<<(17+i)))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
time = pv->item_gettime[17+i];
|
2004-08-23 00:15:46 +00:00
|
|
|
if (time && time > cl.time - 2 && flashon )
|
|
|
|
{ // flash frame
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (192 + i*16, -16, 16, 16, sb_items[i]);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (time && time > cl.time - 2)
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
2008-01-09 00:29:05 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (sbar_rogue)
|
|
|
|
{
|
|
|
|
// new rogue items
|
|
|
|
for (i=0 ; i<2 ; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & (1<<(29+i)))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
time = pv->item_gettime[29+i];
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (time && time > cl.time - 2 && flashon )
|
|
|
|
{ // flash frame
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (288 + i*16, -16, 16, 16, rsb_items[i]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (time && time > cl.time - 2)
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// sigils
|
|
|
|
for (i=0 ; i<4 ; i++)
|
2008-01-09 00:29:05 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & (1<<(28+i)))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
time = pv->item_gettime[28+i];
|
2004-08-23 00:15:46 +00:00
|
|
|
if (time && time > cl.time - 2 && flashon )
|
|
|
|
{ // flash frame
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (320-32 + i*8, -16, 8, 16, sb_sigil[i]);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (time && time > cl.time - 2)
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
2008-01-09 00:29:05 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_DrawFrags
|
|
|
|
===============
|
|
|
|
*/
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_DrawFrags (playerview_t *pv)
|
2005-11-26 03:02:55 +00:00
|
|
|
{
|
2004-08-23 00:15:46 +00:00
|
|
|
int i, k, l;
|
|
|
|
int top, bottom;
|
|
|
|
int x, y, f;
|
2007-07-23 18:52:11 +00:00
|
|
|
int ownnum;
|
2004-08-23 00:15:46 +00:00
|
|
|
char num[12];
|
|
|
|
player_info_t *s;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2010-11-21 03:39:12 +00:00
|
|
|
Sbar_SortFrags (false, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
ownnum = Sbar_PlayerNum(pv);
|
2007-07-23 18:52:11 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// draw the text
|
|
|
|
l = scoreboardlines <= 4 ? scoreboardlines : 4;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
x = 23;
|
|
|
|
// xofs = (sbar_rect.width - 320)>>1;
|
|
|
|
y = sbar_rect.height - SBAR_HEIGHT - 23;
|
|
|
|
|
|
|
|
for (i=0 ; i<l ; i++)
|
|
|
|
{
|
|
|
|
k = fragsort[i];
|
|
|
|
s = &cl.players[k];
|
|
|
|
if (!s->name[0])
|
|
|
|
continue;
|
|
|
|
if (s->spectator)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// draw background
|
2007-07-23 18:52:11 +00:00
|
|
|
top = Sbar_TopColour(s);
|
|
|
|
bottom = Sbar_BottomColour(s);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// Draw_Fill (xofs + x*8 + 10, y, 28, 4, top);
|
|
|
|
// Draw_Fill (xofs + x*8 + 10, y+4, 28, 3, bottom);
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_FillPC (sbar_rect.x+x*8 + 10, sbar_rect.y+y, 28, 4, top);
|
|
|
|
Sbar_FillPC (sbar_rect.x+x*8 + 10, sbar_rect.y+y+4, 28, 3, bottom);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw number
|
|
|
|
f = s->frags;
|
|
|
|
sprintf (num, "%3i",f);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
Sbar_DrawCharacter ( (x+1)*8 , -24, num[0]);
|
|
|
|
Sbar_DrawCharacter ( (x+2)*8 , -24, num[1]);
|
|
|
|
Sbar_DrawCharacter ( (x+3)*8 , -24, num[2]);
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
if (k == ownnum)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
Sbar_DrawCharacter (x*8+2, -24, 16);
|
|
|
|
Sbar_DrawCharacter ( (x+4)*8-4, -24, 17);
|
|
|
|
}
|
|
|
|
x+=4;
|
|
|
|
}
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImageColours(1.0, 1.0, 1.0, 1.0);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_DrawFace
|
|
|
|
===============
|
|
|
|
*/
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_DrawFace (playerview_t *pv)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int f, anim;
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if ( (pv->stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY) )
|
2004-08-23 00:15:46 +00:00
|
|
|
== (IT_INVISIBILITY | IT_INVULNERABILITY) )
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (112, 0, 24, 24, sb_face_invis_invuln);
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & IT_QUAD)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (112, 0, 24, 24, sb_face_quad );
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & IT_INVISIBILITY)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (112, 0, 24, 24, sb_face_invis );
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & IT_INVULNERABILITY)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (112, 0, 24, 24, sb_face_invuln);
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_HEALTH] >= 100)
|
2004-08-23 00:15:46 +00:00
|
|
|
f = 4;
|
|
|
|
else
|
2013-06-23 02:17:02 +00:00
|
|
|
f = pv->stats[STAT_HEALTH] / 20;
|
2004-10-13 07:24:59 +00:00
|
|
|
|
|
|
|
if (f < 0)
|
|
|
|
f=0;
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (cl.time <= pv->faceanimtime)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
anim = 1;
|
|
|
|
sb_updates = 0; // make sure the anim gets drawn over
|
|
|
|
}
|
|
|
|
else
|
|
|
|
anim = 0;
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (112, 0, 24, 24, sb_faces[f][anim]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
Sbar_DrawNormal
|
|
|
|
=============
|
|
|
|
*/
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_DrawNormal (playerview_t *pv)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
if (cl_sbar.value || (scr_viewsize.value<100&&cl.splitclients==1))
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 320, 24, sb_sbar);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// armor
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & IT_INVULNERABILITY)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
Sbar_DrawNum (24, 0, 666, 3, 1);
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, draw_disc);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (sbar_rogue)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawNum (24, 0, pv->stats[STAT_ARMOR], 3,
|
|
|
|
pv->stats[STAT_ARMOR] <= 25);
|
|
|
|
if (pv->stats[STAT_ITEMS] & RIT_ARMOR3)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, sb_armor[2]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_ARMOR2)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, sb_armor[1]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_ARMOR1)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, sb_armor[0]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawNum (24, 0, pv->stats[STAT_ARMOR], 3,
|
|
|
|
pv->stats[STAT_ARMOR] <= 25);
|
|
|
|
if (pv->stats[STAT_ITEMS] & IT_ARMOR3)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, sb_armor[2]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & IT_ARMOR2)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, sb_armor[1]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & IT_ARMOR1)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (0, 0, 24, 24, sb_armor[0]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// face
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawFace (pv);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// health
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawNum (136, 0, pv->stats[STAT_HEALTH], 3
|
|
|
|
, pv->stats[STAT_HEALTH] <= 25);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// ammo icon
|
|
|
|
if (sbar_rogue)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & RIT_SHELLS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[0]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_NAILS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[1]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_ROCKETS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[2]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_CELLS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[3]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_LAVA_NAILS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, rsb_ammo[0]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_PLASMA_AMMO)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, rsb_ammo[1]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & RIT_MULTI_ROCKETS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, rsb_ammo[2]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_ITEMS] & IT_SHELLS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[0]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & IT_NAILS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[1]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & IT_ROCKETS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[2]);
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (pv->stats[STAT_ITEMS] & IT_CELLS)
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawPic (224, 0, 24, 24, sb_ammo[3]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawNum (248, 0, pv->stats[STAT_AMMO], 3
|
|
|
|
, pv->stats[STAT_AMMO] <= 10);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2007-02-26 03:00:25 +00:00
|
|
|
qboolean Sbar_ShouldDraw (void)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2007-02-26 03:00:25 +00:00
|
|
|
#ifdef TEXTEDITOR
|
2004-08-23 00:15:46 +00:00
|
|
|
extern qboolean editoractive;
|
|
|
|
#endif
|
|
|
|
qboolean headsup;
|
|
|
|
|
|
|
|
if (scr_con_current == vid.height)
|
2007-02-26 03:00:25 +00:00
|
|
|
return false; // console is full screen
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
#ifdef TEXTEDITOR
|
|
|
|
if (editoractive)
|
2007-02-26 03:00:25 +00:00
|
|
|
return false;
|
2004-08-23 00:15:46 +00:00
|
|
|
#endif
|
|
|
|
|
2005-09-09 23:40:55 +00:00
|
|
|
#ifdef VM_UI
|
2004-08-23 00:15:46 +00:00
|
|
|
if (UI_DrawStatusBar((sb_showscores?1:0) + (sb_showteamscores?2:0))>0)
|
2007-02-26 03:00:25 +00:00
|
|
|
return false;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (UI_MenuState())
|
2007-02-26 03:00:25 +00:00
|
|
|
return false;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
headsup = !(cl_sbar.value || (scr_viewsize.value<100&&cl.splitclients==1));
|
|
|
|
if ((sb_updates >= vid.numpages) && !headsup)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Sbar_DrawScoreboard (void)
|
|
|
|
{
|
|
|
|
int pnum;
|
|
|
|
int deadcount=0;
|
|
|
|
|
|
|
|
if (cls.protocol == CP_QUAKE2)
|
|
|
|
return;
|
|
|
|
|
2010-11-10 03:32:47 +00:00
|
|
|
#ifndef CLIENTONLY
|
|
|
|
/*no scoreboard in single player (if you want bots, set deathmatch)*/
|
2013-03-12 22:53:23 +00:00
|
|
|
if (sv.state && !cls.deathmatch && sv.allocated_client_slots == 1)
|
2010-11-10 03:32:47 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-02-26 03:00:25 +00:00
|
|
|
for (pnum = 0; pnum < cl.splitclients; pnum++)
|
|
|
|
{
|
2012-07-05 19:42:36 +00:00
|
|
|
if (cl.playerview[pnum].stats[STAT_HEALTH] <= 0)
|
2007-02-26 03:00:25 +00:00
|
|
|
deadcount++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (deadcount == cl.splitclients && !cl.spectator)
|
|
|
|
{
|
|
|
|
if (cl.teamplay > 0 && !sb_showscores)
|
|
|
|
Sbar_TeamOverlay();
|
|
|
|
else
|
|
|
|
Sbar_DeathmatchOverlay (0);
|
|
|
|
}
|
|
|
|
else if (sb_showscores)
|
|
|
|
Sbar_DeathmatchOverlay (0);
|
|
|
|
else if (sb_showteamscores)
|
|
|
|
Sbar_TeamOverlay();
|
|
|
|
else
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
2007-02-26 03:00:25 +00:00
|
|
|
|
|
|
|
sb_updates = 0;
|
|
|
|
}
|
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_Hexen2DrawItem(playerview_t *pv, int x, int y, int itemnum)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
|
|
|
int num;
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(x, y, 29, 28, R2D_SafeCachePic(va("gfx/arti%02d.lmp", itemnum)));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
num = pv->stats[STAT_H2_CNT_TORCH+itemnum];
|
2008-06-01 22:06:22 +00:00
|
|
|
if(num > 0)
|
|
|
|
{
|
|
|
|
if (num >= 10)
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(x+20, y+21, 4, 6, R2D_SafeCachePic(va("gfx/artinum%d.lmp", num/10)));
|
|
|
|
Sbar_DrawPic(x+20+4, y+21, 4, 6, R2D_SafeCachePic(va("gfx/artinum%d.lmp", num%10)));
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_Hexen2DrawInventory(playerview_t *pv)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int x, y=-37;
|
2010-08-28 17:14:38 +00:00
|
|
|
int activeleft = 0;
|
|
|
|
int activeright = 0;
|
|
|
|
|
|
|
|
/*always select an artifact that we actually have whether we are drawing the full bar or not.*/
|
|
|
|
for (i = 0; i < 15; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_CNT_TORCH+(i+pv->sb_hexen2_cur_item)%15])
|
2010-08-28 17:14:38 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
pv->sb_hexen2_cur_item = (pv->sb_hexen2_cur_item + i)%15;
|
2010-08-28 17:14:38 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-06-01 22:06:22 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->sb_hexen2_item_time+3 < realtime)
|
2008-06-01 22:06:22 +00:00
|
|
|
return;
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
for (i = pv->sb_hexen2_cur_item; i < 15; i++)
|
|
|
|
if (pv->sb_hexen2_cur_item == i || pv->stats[STAT_H2_CNT_TORCH+i] > 0)
|
2010-08-28 17:14:38 +00:00
|
|
|
activeright++;
|
2013-06-23 02:17:02 +00:00
|
|
|
for (i = pv->sb_hexen2_cur_item-1; i >= 0; i--)
|
|
|
|
if (pv->sb_hexen2_cur_item == i || pv->stats[STAT_H2_CNT_TORCH+i] > 0)
|
2010-08-28 17:14:38 +00:00
|
|
|
activeleft++;
|
|
|
|
|
|
|
|
if (activeleft > 3 + (activeright<=3?(4-activeright):0))
|
|
|
|
activeleft = 3 + (activeright<=3?(4-activeright):0);
|
|
|
|
x=320/2-114 + (activeleft-1)*33;
|
2013-06-23 02:17:02 +00:00
|
|
|
for (i = pv->sb_hexen2_cur_item-1; x>=320/2-114; i--)
|
2010-08-28 17:14:38 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!pv->stats[STAT_H2_CNT_TORCH+i])
|
2010-08-28 17:14:38 +00:00
|
|
|
continue;
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (i == pv->sb_hexen2_cur_item)
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(x+9, y-12, 11, 11, R2D_SafeCachePic("gfx/artisel.lmp"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_Hexen2DrawItem(pv, x, y, i);
|
2010-08-28 17:14:38 +00:00
|
|
|
x -= 33;
|
|
|
|
}
|
|
|
|
|
|
|
|
x=320/2-114 + activeleft*33;
|
2013-06-23 02:17:02 +00:00
|
|
|
for (i = pv->sb_hexen2_cur_item; i < 15 && x < 320/2-114+7*33; i++)
|
2010-08-28 17:14:38 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (i != pv->sb_hexen2_cur_item && !pv->stats[STAT_H2_CNT_TORCH+i])
|
2010-08-28 17:14:38 +00:00
|
|
|
continue;
|
2013-06-23 02:17:02 +00:00
|
|
|
if (i == pv->sb_hexen2_cur_item)
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(x+9, y-12, 11, 11, R2D_SafeCachePic("gfx/artisel.lmp"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_Hexen2DrawItem(pv, x, y, i);
|
2010-08-28 17:14:38 +00:00
|
|
|
x+=33;
|
|
|
|
}
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_Hexen2DrawExtra (playerview_t *pv)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
|
|
|
unsigned int i, slot;
|
|
|
|
unsigned int pclass;
|
|
|
|
int ringpos[] = {6, 44, 81, 119};
|
2011-05-15 13:23:13 +00:00
|
|
|
//char *ringimages[] = {"gfx/ring_f.lmp", "gfx/ring_w.lmp", "gfx/ring_t.lmp", "gfx/ring_r.lmp"}; //unused variable
|
2008-06-01 22:06:22 +00:00
|
|
|
float val;
|
|
|
|
char *pclassname[] = {
|
|
|
|
"Unknown",
|
|
|
|
"Paladin",
|
2011-05-15 13:23:13 +00:00
|
|
|
"Crusader",
|
2008-11-09 22:29:28 +00:00
|
|
|
"Necromancer",
|
|
|
|
"Assasin",
|
|
|
|
"Demoness"
|
2008-06-01 22:06:22 +00:00
|
|
|
};
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->sb_hexen2_infoplaque)
|
2010-08-16 02:03:02 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
Con_Printf("Objectives:\n");
|
|
|
|
for (i = 0; i < 64; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_OBJECTIVE1 + i/32] & (1<<(i&31)))
|
2010-08-16 02:03:02 +00:00
|
|
|
Con_Printf("%s\n", T_GetInfoString(i));
|
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
pv->sb_hexen2_infoplaque = false;
|
2010-08-16 02:03:02 +00:00
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!pv->sb_hexen2_extra_info)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
|
|
|
sbar_rect.y -= 46-SBAR_HEIGHT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
pclass = cl.players[pv->playernum].h2playerclass;
|
2008-06-01 22:06:22 +00:00
|
|
|
if (pclass >= sizeof(pclassname)/sizeof(pclassname[0]))
|
|
|
|
pclass = sizeof(pclassname)/sizeof(pclassname[0]) - 1;
|
|
|
|
|
|
|
|
|
|
|
|
//adjust it so there's space
|
|
|
|
sbar_rect.y -= 46+98-SBAR_HEIGHT;
|
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(0, 46, 160, 98, R2D_SafeCachePic("gfx/btmbar1.lmp"));
|
|
|
|
Sbar_DrawPic(160, 46, 160, 98, R2D_SafeCachePic("gfx/btmbar2.lmp"));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
Sbar_DrawTinyString (11, 48, pclassname[pclass]);
|
|
|
|
|
|
|
|
Sbar_DrawTinyString (11, 58, va("int"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (33, 58, va("%02d", pv->stats[STAT_H2_INTELLIGENCE]));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
Sbar_DrawTinyString (11, 64, va("wis"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (33, 64, va("%02d", pv->stats[STAT_H2_WISDOM]));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
Sbar_DrawTinyString (11, 70, va("dex"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (33, 70, va("%02d", pv->stats[STAT_H2_DEXTERITY]));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_DrawTinyString (58, 58, va("str"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (80, 58, va("%02d", pv->stats[STAT_H2_STRENGTH]));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
Sbar_DrawTinyString (58, 64, va("lvl"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (80, 64, va("%02d", pv->stats[STAT_H2_LEVEL]));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
Sbar_DrawTinyString (58, 70, va("exp"));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (80, 70, va("%06d", pv->stats[STAT_H2_EXPERIENCE]));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
Sbar_DrawTinyString (11, 79, va("abilities"));
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_FLAGS] & (1<<22))
|
2011-12-23 03:12:29 +00:00
|
|
|
Sbar_DrawTinyString (8, 89, T_GetString(400 + 2*(pclass-1) + 0));
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_FLAGS] & (1<<23))
|
2011-12-23 03:12:29 +00:00
|
|
|
Sbar_DrawTinyString (8, 96, T_GetString(400 + 2*(pclass-1) + 1));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_ARMOUR1+i] > 0)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic (164+i*40, 115, 28, 19, R2D_SafeCachePic(va("gfx/armor%d.lmp", i+1)));
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString (168+i*40, 136, va("+%d", pv->stats[STAT_H2_ARMOUR1+i]));
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_FLIGHT_T+i] > 0)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic (ringpos[i], 119, 32, 22, R2D_SafeCachePic(va("gfx/ring_f.lmp")));
|
2013-06-23 02:17:02 +00:00
|
|
|
val = pv->stats[STAT_H2_FLIGHT_T+i];
|
2008-06-01 22:06:22 +00:00
|
|
|
if (val > 100)
|
|
|
|
val = 100;
|
|
|
|
if (val < 0)
|
|
|
|
val = 0;
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(ringpos[i]+29 - (int)(26 * (val/(float)100)),142, 26, 1, R2D_SafeCachePic("gfx/ringhlth.lmp"));
|
|
|
|
Sbar_DrawPic(ringpos[i]+29, 142, 26, 1, R2D_SafeCachePic("gfx/rhlthcvr.lmp"));
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
slot = 0;
|
|
|
|
for (i = 0; i < 8; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->statsstr[STAT_H2_PUZZLE1+i])
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawPic (194+(slot%4)*31, slot<4?51:82, 26, 26, R2D_SafeCachePic(va("gfx/puzzle/%s.lmp", pv->statsstr[STAT_H2_PUZZLE1+i])));
|
2008-06-01 22:06:22 +00:00
|
|
|
slot++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(134, 50, 49, 56, R2D_SafeCachePic(va("gfx/cport%d.lmp", pclass)));
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static int Sbar_Hexen2ArmourValue(playerview_t *pv)
|
2010-08-12 01:16:37 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
float ac = 0;
|
|
|
|
/*
|
|
|
|
WARNING: these values match the engine - NOT the gamecode!
|
|
|
|
Even the gamecode's values are misleading due to an indexing bug.
|
|
|
|
*/
|
|
|
|
static int acv[5][4] =
|
|
|
|
{
|
|
|
|
{8, 6, 2, 4},
|
|
|
|
{4, 8, 6, 2},
|
|
|
|
{2, 4, 8, 6},
|
|
|
|
{6, 2, 4, 8},
|
|
|
|
{6, 2, 4, 8}
|
|
|
|
};
|
|
|
|
|
|
|
|
int classno;
|
2013-06-23 02:17:02 +00:00
|
|
|
classno = cl.players[pv->playernum].h2playerclass;
|
2010-08-12 01:16:37 +00:00
|
|
|
if (classno >= 1 && classno <= 5)
|
|
|
|
{
|
|
|
|
classno--;
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->stats[STAT_H2_ARMOUR1+i])
|
2010-08-12 01:16:37 +00:00
|
|
|
{
|
|
|
|
ac += acv[classno][i];
|
2013-06-23 02:17:02 +00:00
|
|
|
ac += pv->stats[STAT_H2_ARMOUR1+i]/5.0;
|
2010-08-12 01:16:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ac;
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_Hexen2DrawBasic(playerview_t *pv)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
|
|
|
int chainpos;
|
|
|
|
int val, maxval;
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(0, 0, 160, 46, R2D_SafeCachePic("gfx/topbar1.lmp"));
|
|
|
|
Sbar_DrawPic(160, 0, 160, 46, R2D_SafeCachePic("gfx/topbar2.lmp"));
|
|
|
|
Sbar_DrawPic(0, -23, 51, 23, R2D_SafeCachePic("gfx/topbumpl.lmp"));
|
|
|
|
Sbar_DrawPic(138, -8, 39, 8, R2D_SafeCachePic("gfx/topbumpm.lmp"));
|
|
|
|
Sbar_DrawPic(269, -23, 51, 23, R2D_SafeCachePic("gfx/topbumpr.lmp"));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
//mana1
|
2013-06-23 02:17:02 +00:00
|
|
|
maxval = pv->stats[STAT_H2_MAXMANA];
|
|
|
|
val = pv->stats[STAT_H2_BLUEMANA];
|
2008-06-01 22:06:22 +00:00
|
|
|
val = bound(0, val, maxval);
|
|
|
|
Sbar_DrawTinyString(201, 22, va("%03d", val));
|
|
|
|
if(val)
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(190, 26-(int)((val*18.0)/(float)maxval+0.5), 3, 19, R2D_SafeCachePic("gfx/bmana.lmp"));
|
|
|
|
Sbar_DrawPic(190, 27, 3, 19, R2D_SafeCachePic("gfx/bmanacov.lmp"));
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//mana2
|
2013-06-23 02:17:02 +00:00
|
|
|
maxval = pv->stats[STAT_H2_MAXMANA];
|
|
|
|
val = pv->stats[STAT_H2_GREENMANA];
|
2008-06-01 22:06:22 +00:00
|
|
|
val = bound(0, val, maxval);
|
|
|
|
Sbar_DrawTinyString(243, 22, va("%03d", val));
|
|
|
|
if(val)
|
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(232, 26-(int)((val*18.0)/(float)maxval+0.5), 3, 19, R2D_SafeCachePic("gfx/gmana.lmp"));
|
|
|
|
Sbar_DrawPic(232, 27, 3, 19, R2D_SafeCachePic("gfx/gmanacov.lmp"));
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//health
|
2013-06-23 02:17:02 +00:00
|
|
|
val = pv->stats[STAT_HEALTH];
|
2008-06-01 22:06:22 +00:00
|
|
|
if (val < -99)
|
|
|
|
val = -99;
|
|
|
|
Sbar_Hexen2DrawNum(58, 14, val, 3);
|
|
|
|
|
|
|
|
//armour
|
2013-06-23 02:17:02 +00:00
|
|
|
val = Sbar_Hexen2ArmourValue(pv);
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_Hexen2DrawNum(105, 14, val, 2);
|
|
|
|
|
|
|
|
// SetChainPosition(cl.v.health, cl.v.max_health);
|
2013-06-23 02:17:02 +00:00
|
|
|
chainpos = (195.0f*pv->stats[STAT_HEALTH]) / pv->stats[STAT_H2_MAXHEALTH];
|
2008-06-01 22:06:22 +00:00
|
|
|
if (chainpos < 0)
|
|
|
|
chainpos = 0;
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(45+((int)chainpos&7), 38, 222, 5, R2D_SafeCachePic("gfx/hpchain.lmp"));
|
|
|
|
Sbar_DrawPic(45+(int)chainpos, 36, 35, 9, R2D_SafeCachePic("gfx/hpgem.lmp"));
|
|
|
|
Sbar_DrawPic(43, 36, 10, 10, R2D_SafeCachePic("gfx/chnlcov.lmp"));
|
|
|
|
Sbar_DrawPic(267, 36, 10, 10, R2D_SafeCachePic("gfx/chnrcov.lmp"));
|
2008-06-01 22:06:22 +00:00
|
|
|
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_Hexen2DrawItem(pv, 144, 3, pv->sb_hexen2_cur_item);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_Hexen2DrawMinimal(playerview_t *pv)
|
2010-08-28 17:14:38 +00:00
|
|
|
{
|
|
|
|
int y;
|
|
|
|
y = -16;
|
2011-03-31 01:14:01 +00:00
|
|
|
Sbar_DrawPic(3, y, 31, 17, R2D_SafeCachePic("gfx/bmmana.lmp"));
|
|
|
|
Sbar_DrawPic(3, y+18, 31, 17, R2D_SafeCachePic("gfx/gmmana.lmp"));
|
2010-08-28 17:14:38 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawTinyString(10, y+6, va("%03d", pv->stats[STAT_H2_BLUEMANA]));
|
|
|
|
Sbar_DrawTinyString(10, y+18+6, va("%03d", pv->stats[STAT_H2_GREENMANA]));
|
2010-08-28 17:14:38 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_Hexen2DrawNum(38, y+18, pv->stats[STAT_HEALTH], 3);
|
2010-08-28 17:14:38 +00:00
|
|
|
}
|
2008-11-09 22:29:28 +00:00
|
|
|
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_DrawTeamStatus(playerview_t *pv)
|
2008-11-09 22:29:28 +00:00
|
|
|
{
|
|
|
|
int p;
|
|
|
|
int y;
|
|
|
|
int track;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!sbar_teamstatus.ival)
|
2008-11-09 22:29:28 +00:00
|
|
|
return;
|
|
|
|
y = -32;
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
track = Cam_TrackNum(pv);
|
2008-11-09 22:29:28 +00:00
|
|
|
if (track == -1 || !cl.spectator)
|
2013-06-23 02:17:02 +00:00
|
|
|
track = pv->playernum;
|
2008-11-09 22:29:28 +00:00
|
|
|
|
|
|
|
for (p = 0; p < MAX_CLIENTS; p++)
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->playernum == p) //self is not shown
|
2008-11-09 22:29:28 +00:00
|
|
|
continue;
|
|
|
|
if (track == p) //nor is the person you are tracking
|
|
|
|
continue;
|
|
|
|
|
2011-06-16 02:03:57 +00:00
|
|
|
if (cl.players[p].teamstatustime < realtime)
|
|
|
|
continue;
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
if (!*cl.players[p].teamstatus) //only show them if they have something. no blank lines thanks
|
|
|
|
continue;
|
|
|
|
if (strcmp(cl.players[p].team, cl.players[track].team))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (*cl.players[p].name)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_DrawString (0, y, cl.players[p].teamstatus);
|
2008-11-09 22:29:28 +00:00
|
|
|
y-=8;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sbar_parsingteamstatuses = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
qboolean Sbar_UpdateTeamStatus(player_info_t *player, char *status)
|
|
|
|
{
|
|
|
|
qboolean aswhite = false;
|
|
|
|
char *outb;
|
|
|
|
int outlen;
|
|
|
|
char *msgstart;
|
|
|
|
char *ledstatus;
|
|
|
|
|
|
|
|
if (*status != '\r')// && !(strchr(status, 0x86) || strchr(status, 0x87) || strchr(status, 0x88) || strchr(status, 0x89)))
|
|
|
|
{
|
|
|
|
if (*status != 'x' || status[1] != '\r')
|
|
|
|
return false;
|
|
|
|
status++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*status == '\r')
|
|
|
|
{
|
|
|
|
while (*status == ' ' || *status == '\r')
|
|
|
|
status++;
|
|
|
|
ledstatus = status;
|
|
|
|
if (*(unsigned char*)ledstatus >= 0x86 && *(unsigned char*)ledstatus <= 0x89)
|
|
|
|
{
|
|
|
|
msgstart = strchr(status, ':');
|
|
|
|
if (!status)
|
|
|
|
return false;
|
|
|
|
if (msgstart)
|
|
|
|
status = msgstart+1;
|
|
|
|
else
|
|
|
|
ledstatus = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
ledstatus = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
ledstatus = NULL;
|
|
|
|
|
|
|
|
while (*status == ' ' || *status == '\r')
|
|
|
|
status++;
|
|
|
|
|
|
|
|
//fixme: handle { and } stuff (assume red?)
|
|
|
|
outb = player->teamstatus;
|
|
|
|
outlen = sizeof(player->teamstatus)-1;
|
|
|
|
if (ledstatus)
|
|
|
|
{
|
|
|
|
*outb++ = *ledstatus;
|
|
|
|
outlen--;
|
|
|
|
}
|
|
|
|
|
|
|
|
while(outlen>0 && *status)
|
|
|
|
{
|
|
|
|
if (*status == '{')
|
|
|
|
{
|
|
|
|
aswhite=true;
|
|
|
|
status++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (aswhite)
|
|
|
|
{
|
|
|
|
if (*status == '}')
|
|
|
|
{
|
|
|
|
aswhite = false;
|
|
|
|
status++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*outb++ = *status++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*outb++ = *status++|128;
|
|
|
|
outlen--;
|
|
|
|
}
|
|
|
|
|
2011-06-16 02:03:57 +00:00
|
|
|
player->teamstatustime = realtime + 10;
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
*outb = '\0';
|
|
|
|
|
|
|
|
if (sbar_teamstatus.value == 2)
|
|
|
|
return sbar_parsingteamstatuses;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-11-20 22:01:16 +00:00
|
|
|
|
|
|
|
static void Sbar_Voice(int y)
|
|
|
|
{
|
|
|
|
#ifdef VOICECHAT
|
|
|
|
int loudness;
|
|
|
|
if (!cl_voip_showmeter.ival)
|
|
|
|
return;
|
|
|
|
loudness = S_Voip_Loudness(cl_voip_showmeter.ival==2);
|
|
|
|
if (loudness >= 0)
|
|
|
|
{
|
|
|
|
int x=0,t;
|
|
|
|
int s, i;
|
|
|
|
float range = loudness/100.0f;
|
|
|
|
Font_BeginString(font_conchar, x, y, &t, &t);
|
|
|
|
x = vid.width;
|
|
|
|
x -= Font_CharWidth(0xe080 | CON_WHITEMASK);
|
|
|
|
x -= Font_CharWidth(0xe081 | CON_WHITEMASK)*16;
|
|
|
|
x -= Font_CharWidth(0xe082 | CON_WHITEMASK);
|
|
|
|
x /= 2;
|
|
|
|
x -= Font_CharWidth('M' | CON_WHITEMASK);
|
|
|
|
x -= Font_CharWidth('i' | CON_WHITEMASK);
|
|
|
|
x -= Font_CharWidth('c' | CON_WHITEMASK);
|
|
|
|
x -= Font_CharWidth(' ' | CON_WHITEMASK);
|
|
|
|
|
|
|
|
y = sbar_rect.y + y+ sbar_rect.height-SBAR_HEIGHT;
|
|
|
|
Font_BeginString(font_conchar, x, y, &x, &y);
|
|
|
|
x = Font_DrawChar(x, y, 'M' | CON_WHITEMASK);
|
|
|
|
x = Font_DrawChar(x, y, 'i' | CON_WHITEMASK);
|
|
|
|
x = Font_DrawChar(x, y, 'c' | CON_WHITEMASK);
|
|
|
|
x = Font_DrawChar(x, y, ' ' | CON_WHITEMASK);
|
|
|
|
x = Font_DrawChar(x, y, 0xe080 | CON_WHITEMASK);
|
|
|
|
s = x;
|
|
|
|
for (i=0 ; i<16 ; i++)
|
|
|
|
x = Font_DrawChar(x, y, 0xe081 | CON_WHITEMASK);
|
|
|
|
Font_DrawChar(x, y, 0xe082 | CON_WHITEMASK);
|
|
|
|
Font_DrawChar(s + (x-s) * range - Font_CharWidth(0xe083 | CON_WHITEMASK)/2, y, 0xe083 | CON_WHITEMASK);
|
|
|
|
Font_EndString(font_conchar);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-02-26 03:00:25 +00:00
|
|
|
/*
|
|
|
|
===============
|
|
|
|
Sbar_Draw
|
|
|
|
===============
|
|
|
|
*/
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_Draw (playerview_t *pv)
|
2007-02-26 03:00:25 +00:00
|
|
|
{
|
|
|
|
qboolean headsup;
|
|
|
|
char st[512];
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
int sbarwidth;
|
|
|
|
qboolean minidmoverlay;
|
|
|
|
extern cvar_t scr_centersbar;
|
2007-02-26 03:00:25 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
headsup = !(cl_sbar.value || (scr_viewsize.value<100&&cl.splitclients==1));
|
|
|
|
if ((sb_updates >= vid.numpages) && !headsup)
|
|
|
|
return;
|
|
|
|
|
2008-11-09 22:29:28 +00:00
|
|
|
sbar_parsingteamstatuses = false;
|
|
|
|
|
2009-04-01 22:03:56 +00:00
|
|
|
#ifdef HLCLIENT
|
|
|
|
if (CLHL_DrawHud())
|
|
|
|
return;
|
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
#ifdef Q2CLIENT
|
2005-05-26 12:55:34 +00:00
|
|
|
if (cls.protocol == CP_QUAKE2)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
sbar_rect = r_refdef.grect;
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImageColours(1, 1, 1, 1);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (*cl.q2statusbar)
|
2007-02-26 03:00:25 +00:00
|
|
|
Sbar_ExecuteLayoutString(cl.q2statusbar);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (*cl.q2layout)
|
|
|
|
{
|
2011-06-29 18:39:11 +00:00
|
|
|
if (cl.q2frame.playerstate.stats[Q2STAT_LAYOUTS] & 1)
|
2004-08-23 00:15:46 +00:00
|
|
|
Sbar_ExecuteLayoutString(cl.q2layout);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
Sbar_Start();
|
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImageColours(1, 1, 1, 1);
|
2009-11-04 21:16:50 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
minidmoverlay = cl.deathmatch;
|
|
|
|
sbar_rect = r_refdef.grect;
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
sbarwidth = 320;
|
|
|
|
if (minidmoverlay && r_refdef.grect.width >= 640 && cl.teamplay)
|
|
|
|
sbarwidth += 320;
|
|
|
|
else if (minidmoverlay && r_refdef.grect.width >= 512)
|
|
|
|
sbarwidth += 192;
|
|
|
|
else
|
|
|
|
minidmoverlay = 0;
|
|
|
|
|
|
|
|
if (scr_centersbar.ival)
|
|
|
|
{
|
|
|
|
int ofs = (sbar_rect.width - sbarwidth)/2;
|
|
|
|
sbar_rect.x += ofs;
|
|
|
|
sbar_rect.width -= ofs;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
sb_updates++;
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (sbar_hexen2)
|
|
|
|
{
|
|
|
|
//hexen2 hud
|
|
|
|
if (sb_lines > 24 || pv->sb_hexen2_extra_info)
|
2008-06-01 22:06:22 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_Hexen2DrawExtra(pv);
|
|
|
|
Sbar_Hexen2DrawBasic(pv);
|
2008-06-01 22:06:22 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (sb_lines > 0)
|
|
|
|
Sbar_Hexen2DrawMinimal(pv);
|
|
|
|
Sbar_Hexen2DrawInventory(pv);
|
2007-06-20 00:02:54 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (cl.deathmatch)
|
|
|
|
Sbar_MiniDeathmatchOverlay (pv);
|
|
|
|
}
|
|
|
|
else if (sbarfailed) //files failed to load.
|
|
|
|
{
|
|
|
|
//fallback hud
|
|
|
|
if (pv->stats[STAT_HEALTH] > 0) //when dead, show nothing
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
// if (scr_viewsize.value != 120)
|
|
|
|
// Cvar_Set(&scr_viewsize, "120");
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawString (0, -8, va("Health: %i", pv->stats[STAT_HEALTH]));
|
|
|
|
Sbar_DrawString (0, -16, va(" Armor: %i", pv->stats[STAT_ARMOR]));
|
2010-11-20 22:01:16 +00:00
|
|
|
|
|
|
|
Sbar_Voice(-24);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//standard quake(world) hud.
|
|
|
|
// top line
|
|
|
|
if (sb_lines > 24)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!cl.spectator || pv->cam_auto == CAM_TRACK)
|
|
|
|
Sbar_DrawInventory (pv);
|
|
|
|
if ((!headsup || sbar_rect.width<512) && cl.deathmatch)
|
|
|
|
Sbar_DrawFrags (pv);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
// main area
|
|
|
|
if (sb_lines > 0)
|
|
|
|
{
|
|
|
|
if (cl.spectator)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (pv->cam_auto != CAM_TRACK)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawPic (0, 0, 320, 24, sb_scorebar);
|
|
|
|
Sbar_DrawString (160-7*8,4, "SPECTATOR MODE");
|
|
|
|
Sbar_DrawString(160-14*8+4, 12, "Press [ATTACK] for AutoCamera");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (sb_showscores || sb_showteamscores || pv->stats[STAT_HEALTH] <= 0)
|
|
|
|
Sbar_SoloScoreboard ();
|
|
|
|
// else if (cls.gamemode != GAME_DEATHMATCH)
|
|
|
|
// Sbar_CoopScoreboard ();
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawNormal (pv);
|
|
|
|
|
|
|
|
if (hud_tracking_show.ival)
|
2005-12-08 18:42:08 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
Q_snprintfz(st, sizeof(st), "Tracking %-.64s",
|
|
|
|
cl.players[pv->cam_spec_track].name);
|
|
|
|
Sbar_DrawString(0, -8, st);
|
2005-12-08 18:42:08 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
}
|
|
|
|
else if (sb_showscores || sb_showteamscores || (pv->stats[STAT_HEALTH] <= 0 && cl.splitclients == 1))
|
|
|
|
{
|
|
|
|
if (pv == cl.playerview)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!cls.deathmatch)
|
|
|
|
Sbar_CoopScoreboard ();
|
|
|
|
else
|
|
|
|
Sbar_SoloScoreboard ();
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_DrawNormal (pv);
|
|
|
|
}
|
2010-11-20 22:01:16 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (sb_lines > 24)
|
|
|
|
Sbar_Voice(-32);
|
|
|
|
else if (sb_lines > 0)
|
|
|
|
Sbar_Voice(-8);
|
|
|
|
else
|
|
|
|
Sbar_Voice(16);
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (minidmoverlay)
|
|
|
|
Sbar_MiniDeathmatchOverlay (pv);
|
|
|
|
|
|
|
|
if (sb_lines > 0)
|
|
|
|
Sbar_DrawTeamStatus(pv);
|
|
|
|
R2D_ImageColours (1, 1, 1, 1);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-11-30 01:20:53 +00:00
|
|
|
if (cl_sbar.value == 1 || scr_viewsize.value<100)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
if (sbar_rect.x>r_refdef.grect.x)
|
2005-11-30 01:20:53 +00:00
|
|
|
{ // left
|
2013-06-23 02:17:02 +00:00
|
|
|
R2D_TileClear (r_refdef.grect.x, r_refdef.grect.y+sbar_rect.height - sb_lines, sbar_rect.x - r_refdef.grect.x, sb_lines);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
if (sbar_rect.x + 320 <= r_refdef.grect.x + sbar_rect.width && !headsup)
|
|
|
|
R2D_TileClear (sbar_rect.x + 320, r_refdef.grect.y+sbar_rect.height - sb_lines, sbar_rect.width - (320), sb_lines);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
extern int scr_chatmode;
|
|
|
|
if (scr_chatmode)
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_ChatModeOverlay(pv);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
Sbar_IntermissionNumber
|
|
|
|
|
|
|
|
==================
|
|
|
|
*/
|
2012-09-30 05:52:03 +00:00
|
|
|
void Sbar_IntermissionNumber (int x, int y, int num, int digits, int color, qboolean left)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
char str[12];
|
|
|
|
char *ptr;
|
|
|
|
int l, frame;
|
|
|
|
|
|
|
|
l = Sbar_itoa (num, str);
|
|
|
|
ptr = str;
|
|
|
|
if (l > digits)
|
|
|
|
ptr += (l-digits);
|
2012-09-30 05:52:03 +00:00
|
|
|
if (!left)
|
|
|
|
if (l < digits)
|
|
|
|
x += (digits-l)*24;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
while (*ptr)
|
|
|
|
{
|
|
|
|
if (*ptr == '-')
|
|
|
|
frame = STAT_MINUS;
|
|
|
|
else
|
|
|
|
frame = *ptr -'0';
|
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic (x,y, 16, 24, sb_nums[color][frame]);
|
2004-08-23 00:15:46 +00:00
|
|
|
x += 24;
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
#define COL_TEAM_LOWAVGHIGH COLUMN("low/avg/high", 12*8, {sprintf (num, "%3i/%3i/%3i", plow, pavg, phigh); Draw_FunString ( x, y, num); })
|
|
|
|
#define COL_TEAM_TEAM COLUMN("team", 4*8, {Draw_FunStringWidth ( x, y, tm->team, 4*8); \
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!strncmp(cl.players[pv->playernum].team, tm->team, 16))\
|
2012-11-27 03:23:19 +00:00
|
|
|
{\
|
|
|
|
Draw_FunString ( x - 1*8, y, "^Ue010");\
|
|
|
|
Draw_FunString ( x + 4*8, y, "^Ue011");\
|
|
|
|
}\
|
|
|
|
})
|
|
|
|
#define COL_TEAM_TOTAL COLUMN("total", 5*8, {Draw_FunString ( x, y, va("%5i", tm->frags)); })
|
|
|
|
#define COL_TEAM_PLAYERS COLUMN("players", 7*8, {Draw_FunString ( x, y, va("%5i", tm->players)); })
|
|
|
|
#define ALL_TEAM_COLUMNS COL_TEAM_LOWAVGHIGH COL_TEAM_TEAM COL_TEAM_TOTAL COL_TEAM_PLAYERS
|
|
|
|
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
==================
|
|
|
|
Sbar_TeamOverlay
|
|
|
|
|
|
|
|
team frags
|
|
|
|
added by Zoid
|
|
|
|
==================
|
|
|
|
*/
|
|
|
|
void Sbar_TeamOverlay (void)
|
|
|
|
{
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *pic;
|
2012-11-27 03:23:19 +00:00
|
|
|
int i, k;
|
|
|
|
int x, y, l;
|
2004-08-23 00:15:46 +00:00
|
|
|
char num[12];
|
|
|
|
team_t *tm;
|
|
|
|
int plow, phigh, pavg;
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = r_refdef.playerview;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// request new ping times every two second
|
2010-11-21 03:39:12 +00:00
|
|
|
if (!cl.teamplay)
|
|
|
|
{
|
2004-08-23 00:15:46 +00:00
|
|
|
Sbar_DeathmatchOverlay(0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
y = 0;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_drawtitle.ival)
|
2007-07-23 18:52:11 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
pic = R2D_SafeCachePic ("gfx/ranking.lmp");
|
2007-07-23 18:52:11 +00:00
|
|
|
if (pic)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
k = (pic->width * 24) / pic->height;
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic ((vid.width-k)/2, 0, k, 24, pic);
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
y += 24;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
x = l = (vid.width - 320)/2 + 36;
|
|
|
|
|
|
|
|
#define COLUMN(title, cwidth, code) Draw_FunString(x, y, title), x+=cwidth + 8;
|
|
|
|
ALL_TEAM_COLUMNS
|
|
|
|
// if (rank_width+(cwidth)+8 <= vid.width) {showcolumns |= (1<<COLUMN##title); rank_width += cwidth+8;}
|
|
|
|
|
|
|
|
// Draw_FunString(x, y, "low/avg/high");
|
|
|
|
// Draw_FunString(x+13*8, y, "team");
|
|
|
|
// Draw_FunString(x+18*8, y, "total");
|
|
|
|
// Draw_FunString(x+24*8, y, "players");
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
|
|
|
// Draw_String(x, y, "------------ ---- ----- -------");
|
2012-11-27 03:23:19 +00:00
|
|
|
x = l;
|
|
|
|
#undef COLUMN
|
2013-03-12 22:47:42 +00:00
|
|
|
#define COLUMN(title, cwidth, code) {char buf[64*6]; int t = (cwidth)/8; int c=0; while (t-->0) {buf[c++] = '^'; buf[c++] = 'U'; buf[c++] = 'e'; buf[c++] = '0'; buf[c++] = '1'; buf[c] = (c==5?'d':(!t?'f':'e')); c++;} buf[c] = 0; Draw_FunString(x, y, buf); x += cwidth + 8;}
|
2012-11-27 03:23:19 +00:00
|
|
|
ALL_TEAM_COLUMNS
|
|
|
|
// Draw_FunString(x, y, "^Ue01d^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01f ^Ue01d^Ue01e^Ue01e^Ue01f ^Ue01d^Ue01e^Ue01e^Ue01e^Ue01f ^Ue01d^Ue01e^Ue01e^Ue01e^Ue01e^Ue01e^Ue01f");
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
#undef COLUMN
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// sort the teams
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_SortTeams(pv);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw the text
|
|
|
|
for (i=0 ; i < scoreboardteams && y <= vid.height-10 ; i++)
|
|
|
|
{
|
|
|
|
k = teamsort[i];
|
|
|
|
tm = teams + k;
|
|
|
|
|
|
|
|
// draw pings
|
|
|
|
plow = tm->plow;
|
|
|
|
if (plow < 0 || plow > 999)
|
|
|
|
plow = 999;
|
|
|
|
phigh = tm->phigh;
|
|
|
|
if (phigh < 0 || phigh > 999)
|
|
|
|
phigh = 999;
|
|
|
|
if (!tm->players)
|
|
|
|
pavg = 999;
|
|
|
|
else
|
|
|
|
pavg = tm->ptotal / tm->players;
|
|
|
|
if (pavg < 0 || pavg > 999)
|
|
|
|
pavg = 999;
|
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
x = l;
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
#define COLUMN(title, cwidth, code) code; x+=cwidth + 8;
|
|
|
|
ALL_TEAM_COLUMNS
|
|
|
|
#undef COLUMN
|
|
|
|
#else
|
2004-08-23 00:15:46 +00:00
|
|
|
sprintf (num, "%3i/%3i/%3i", plow, pavg, phigh);
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString ( x, y, num);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw team
|
|
|
|
Q_strncpyz (team, tm->team, sizeof(team));
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x + 104, y, team);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw total
|
|
|
|
sprintf (num, "%5i", tm->frags);
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x + 104 + 40, y, num);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// draw players
|
|
|
|
sprintf (num, "%5i", tm->players);
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString (x + 104 + 88, y, num);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!strncmp(cl.players[cl.playernum[0]].team, tm->team, 16))
|
|
|
|
{
|
2012-11-27 03:23:19 +00:00
|
|
|
Draw_FunString ( x + 104 - 8, y, "^Ue010");
|
|
|
|
Draw_FunString ( x + 104 + 32, y, "^Ue011");
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2012-11-27 03:23:19 +00:00
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
|
|
|
}
|
|
|
|
y += 8;
|
|
|
|
Sbar_DeathmatchOverlay(y);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
Sbar_DeathmatchOverlay
|
|
|
|
|
|
|
|
ping time frags name
|
|
|
|
==================
|
|
|
|
*/
|
2007-07-23 18:52:11 +00:00
|
|
|
|
|
|
|
//for reference:
|
|
|
|
//define COLUMN(title, width, code)
|
|
|
|
|
2007-08-20 02:57:11 +00:00
|
|
|
#define COLUMN_PING COLUMN(ping, 4*8, \
|
|
|
|
{ \
|
|
|
|
int p = s->ping; \
|
|
|
|
if (p < 0 || p > 999) p = 999; \
|
|
|
|
sprintf(num, "%4i", p); \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth(x, y, num, 4*8); \
|
2007-07-23 18:52:11 +00:00
|
|
|
})
|
|
|
|
|
2007-08-20 02:57:11 +00:00
|
|
|
#define COLUMN_PL COLUMN(pl, 2*8, \
|
|
|
|
{ \
|
|
|
|
int p = s->pl; \
|
2007-08-20 06:24:39 +00:00
|
|
|
sprintf(num, "%2i", p); \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth(x, y, num, 2*8); \
|
2007-07-23 18:52:11 +00:00
|
|
|
})
|
2007-08-20 02:57:11 +00:00
|
|
|
#define COLUMN_TIME COLUMN(time, 4*8, \
|
|
|
|
{ \
|
|
|
|
if (cl.intermission) \
|
|
|
|
total = cl.completed_time - s->entertime; \
|
|
|
|
else \
|
|
|
|
total = cl.servertime - s->entertime; \
|
|
|
|
minutes = (int)total/60; \
|
|
|
|
sprintf (num, "%4i", minutes); \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth(x, y, num, 4*8); \
|
2007-07-23 18:52:11 +00:00
|
|
|
})
|
2007-08-20 02:57:11 +00:00
|
|
|
#define COLUMN_FRAGS COLUMN(frags, 5*8, \
|
2009-11-04 21:16:50 +00:00
|
|
|
{ \
|
|
|
|
int cx; int cy; \
|
2007-08-20 02:57:11 +00:00
|
|
|
if (s->spectator) \
|
|
|
|
{ \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth(x, y, "spectator", 5*8); \
|
2007-08-20 02:57:11 +00:00
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
if (largegame) \
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_FillPC(x, y+1, 40, 3, top); \
|
2007-08-20 02:57:11 +00:00
|
|
|
else \
|
2009-11-04 21:16:50 +00:00
|
|
|
Sbar_FillPC(x, y, 40, 4, top); \
|
|
|
|
Sbar_FillPC(x, y+4, 40, 4, bottom); \
|
2007-08-20 02:57:11 +00:00
|
|
|
\
|
|
|
|
f = s->frags; \
|
2009-11-04 21:16:50 +00:00
|
|
|
sprintf(num, "%3i",f); \
|
2007-08-20 02:57:11 +00:00
|
|
|
\
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_BeginString(font_conchar, x+8, y, &cx, &cy); \
|
|
|
|
Font_DrawChar(cx, cy, num[0] | 0xe000 | CON_WHITEMASK); \
|
|
|
|
Font_BeginString(font_conchar, x+16, y, &cx, &cy); \
|
|
|
|
Font_DrawChar(cx, cy, num[1] | 0xe000 | CON_WHITEMASK); \
|
|
|
|
Font_BeginString(font_conchar, x+24, y, &cx, &cy); \
|
|
|
|
Font_DrawChar(cx, cy, num[2] | 0xe000 | CON_WHITEMASK); \
|
2007-08-20 02:57:11 +00:00
|
|
|
\
|
2013-06-23 02:17:02 +00:00
|
|
|
if ((cl.spectator && k == pv->cam_spec_track) ||\
|
|
|
|
(!cl.spectator && k == pv->playernum)) \
|
2007-08-20 02:57:11 +00:00
|
|
|
{ \
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_BeginString(font_conchar, x, y, &cx, &cy); \
|
|
|
|
Font_DrawChar(cx, cy, 16 | 0xe000 | CON_WHITEMASK); \
|
|
|
|
Font_BeginString(font_conchar, x+32, y, &cx, &cy); \
|
|
|
|
Font_DrawChar(cx, cy, 17 | 0xe000 | CON_WHITEMASK); \
|
2007-08-20 02:57:11 +00:00
|
|
|
} \
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_EndString(font_conchar); \
|
2007-08-20 02:57:11 +00:00
|
|
|
} \
|
|
|
|
})
|
|
|
|
#define COLUMN_TEAMNAME COLUMN(team, 4*8, \
|
|
|
|
{ \
|
|
|
|
if (!s->spectator) \
|
|
|
|
{ \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth(x, y, s->team, 4*8); \
|
2007-08-20 02:57:11 +00:00
|
|
|
} \
|
2007-07-23 18:52:11 +00:00
|
|
|
})
|
2009-11-04 21:16:50 +00:00
|
|
|
#define COLUMN_NAME COLUMN(name, (cl.teamplay ? 12*8 : 16*8), {Draw_FunStringWidth(x, y, s->name, (cl.teamplay ? 12*8 : 16*8));})
|
|
|
|
#define COLUMN_KILLS COLUMN(kils, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetKills(k)), 4*8);})
|
|
|
|
#define COLUMN_TKILLS COLUMN(tkil, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTKills(k)), 4*8);})
|
|
|
|
#define COLUMN_DEATHS COLUMN(dths, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetDeaths(k)), 4*8);})
|
|
|
|
#define COLUMN_TOUCHES COLUMN(tchs, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTouches(k)), 4*8);})
|
|
|
|
#define COLUMN_CAPS COLUMN(caps, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetCaptures(k)), 4*8);})
|
2007-07-23 18:52:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//columns are listed here in display order
|
|
|
|
#define ALLCOLUMNS COLUMN_PING COLUMN_PL COLUMN_TIME COLUMN_FRAGS COLUMN_TEAMNAME COLUMN_NAME COLUMN_KILLS COLUMN_TKILLS COLUMN_DEATHS COLUMN_TOUCHES COLUMN_CAPS
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
#define COLUMN(title, width, code) COLUMN##title,
|
|
|
|
ALLCOLUMNS
|
|
|
|
#undef COLUMN
|
|
|
|
COLUMN_MAX
|
|
|
|
};
|
|
|
|
|
|
|
|
#define ADDCOLUMN(id) showcolumns |= (1<<id)
|
2004-08-23 00:15:46 +00:00
|
|
|
void Sbar_DeathmatchOverlay (int start)
|
|
|
|
{
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *pic;
|
2013-05-11 05:03:07 +00:00
|
|
|
int i, k;
|
2004-08-23 00:15:46 +00:00
|
|
|
int x, y, f;
|
|
|
|
char num[12];
|
|
|
|
player_info_t *s;
|
|
|
|
int total;
|
|
|
|
int minutes;
|
|
|
|
int skip = 10;
|
2007-07-23 18:52:11 +00:00
|
|
|
int showcolumns;
|
2007-10-02 16:00:38 +00:00
|
|
|
int startx, rank_width;
|
2013-06-23 02:17:02 +00:00
|
|
|
playerview_t *pv = r_refdef.playerview;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (largegame)
|
|
|
|
skip = 8;
|
|
|
|
|
|
|
|
// request new ping times every two second
|
2010-08-16 02:03:02 +00:00
|
|
|
if (realtime - cl.last_ping_request > 2 && cls.demoplayback != DPB_EZTV)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2010-08-16 02:03:02 +00:00
|
|
|
if (cls.protocol == CP_QUAKEWORLD)
|
|
|
|
{
|
|
|
|
cl.last_ping_request = realtime;
|
|
|
|
CL_SendClientCommand(true, "pings");
|
|
|
|
}
|
|
|
|
else if (cls.protocol == CP_NETQUAKE)
|
|
|
|
{
|
|
|
|
cl.last_ping_request = realtime;
|
|
|
|
CL_SendClientCommand(true, "ping");
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
if (start)
|
|
|
|
y = start;
|
|
|
|
else
|
2004-11-20 01:11:07 +00:00
|
|
|
{
|
2007-07-23 18:52:11 +00:00
|
|
|
y = 0;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_drawtitle.ival)
|
2007-07-23 18:52:11 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
pic = R2D_SafeCachePic ("gfx/ranking.lmp");
|
2007-07-23 18:52:11 +00:00
|
|
|
if (pic)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
k = (pic->width * 24) / pic->height;
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic ((vid.width-k)/2, 0, k, 24, pic);
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
y += 24;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-11-26 03:02:55 +00:00
|
|
|
// scores
|
2010-11-21 03:39:12 +00:00
|
|
|
Sbar_SortFrags(true, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw the text
|
|
|
|
if (start)
|
|
|
|
y = start;
|
|
|
|
else
|
|
|
|
y = 24;
|
2007-07-23 18:52:11 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_newstyle.ival)
|
2007-10-02 16:00:38 +00:00
|
|
|
{
|
|
|
|
// Electro's scoreboard eyecandy: Increase to fit the new scoreboard
|
|
|
|
y += 8;
|
|
|
|
}
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
showcolumns = 0;
|
|
|
|
|
2007-10-02 16:00:38 +00:00
|
|
|
rank_width = 0;
|
2007-07-23 18:52:11 +00:00
|
|
|
|
2007-10-02 16:00:38 +00:00
|
|
|
#define COLUMN(title, cwidth, code) if (rank_width+(cwidth)+8 <= vid.width) {showcolumns |= (1<<COLUMN##title); rank_width += cwidth+8;}
|
2007-07-23 18:52:11 +00:00
|
|
|
//columns are listed here in priority order (if the screen is too narrow, later ones will be hidden)
|
|
|
|
COLUMN_NAME
|
|
|
|
COLUMN_PING
|
2010-08-16 02:03:02 +00:00
|
|
|
if (cls.protocol == CP_QUAKEWORLD)
|
|
|
|
{
|
|
|
|
COLUMN_PL
|
|
|
|
COLUMN_TIME
|
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
COLUMN_FRAGS
|
|
|
|
if (cl.teamplay)
|
|
|
|
{
|
|
|
|
COLUMN_TEAMNAME
|
|
|
|
}
|
|
|
|
if (cl.teamplay && Stats_HaveFlags())
|
|
|
|
{
|
|
|
|
COLUMN_CAPS
|
|
|
|
}
|
|
|
|
if (scr_scoreboard_showfrags.value && Stats_HaveKills())
|
|
|
|
{
|
|
|
|
COLUMN_KILLS
|
|
|
|
COLUMN_DEATHS
|
|
|
|
if (cl.teamplay)
|
|
|
|
{
|
|
|
|
COLUMN_TKILLS
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (cl.teamplay && Stats_HaveFlags())
|
|
|
|
{
|
|
|
|
COLUMN_TOUCHES
|
|
|
|
}
|
|
|
|
#undef COLUMN
|
|
|
|
|
2007-10-02 16:00:38 +00:00
|
|
|
startx = (vid.width-rank_width)/2;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_newstyle.ival)
|
2007-10-02 16:00:38 +00:00
|
|
|
{
|
|
|
|
// Electro's scoreboard eyecandy: Draw top border
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour (0, 1.0);
|
|
|
|
R2D_FillBlock(startx - 3, y - 1, rank_width - 1, 1);
|
2007-10-02 16:00:38 +00:00
|
|
|
|
|
|
|
// Electro's scoreboard eyecandy: Draw the title row background
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour (1, 1.0);
|
|
|
|
R2D_FillBlock(startx - 2, y, rank_width - 3, 9);
|
2007-10-02 16:00:38 +00:00
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
|
|
|
|
x = startx;
|
|
|
|
#define COLUMN(title, width, code) if (showcolumns & (1<<COLUMN##title)) {Draw_FunString(x, y, #title); x += width+8;}
|
|
|
|
ALLCOLUMNS
|
|
|
|
#undef COLUMN
|
2007-10-02 16:00:38 +00:00
|
|
|
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
y += 8;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_titleseperator.ival && !scr_scoreboard_newstyle.ival)
|
2007-07-23 18:52:11 +00:00
|
|
|
{
|
|
|
|
x = startx;
|
2007-10-02 16:00:38 +00:00
|
|
|
#define COLUMN(title, width, code) \
|
|
|
|
if (showcolumns & (1<<COLUMN##title)) \
|
|
|
|
{ \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString(x, y, "^Ue01d"); \
|
2007-10-02 16:00:38 +00:00
|
|
|
for (i = 8; i < width-8; i+= 8) \
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString(x+i, y, "^Ue01e"); \
|
|
|
|
Draw_FunString(x+i, y, "^Ue01f"); \
|
2007-10-02 16:00:38 +00:00
|
|
|
x += width+8; \
|
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
ALLCOLUMNS
|
|
|
|
#undef COLUMN
|
|
|
|
y += 8;
|
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_newstyle.ival)
|
2007-10-02 16:00:38 +00:00
|
|
|
{
|
|
|
|
// Electro's scoreboard eyecandy: Draw top border (under header)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour (0, 1.0);
|
|
|
|
R2D_FillBlock (startx - 3, y + 1, rank_width - 1, 1);
|
2007-10-02 16:00:38 +00:00
|
|
|
// Electro's scoreboard eyecandy: Don't go over the black border, move the rest down
|
|
|
|
y += 2;
|
|
|
|
// Electro's scoreboard eyecandy: Draw left border
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_FillBlock (startx - 3, y - 10, 1, 9);
|
2007-10-02 16:00:38 +00:00
|
|
|
// Electro's scoreboard eyecandy: Draw right border
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_FillBlock (startx - 3 + rank_width - 2, y - 10, 1, 9);
|
2007-10-02 16:00:38 +00:00
|
|
|
}
|
|
|
|
|
2008-01-30 16:42:49 +00:00
|
|
|
y -= skip;
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
for (i = 0; i < scoreboardlines; i++)
|
|
|
|
{
|
2007-10-02 16:00:38 +00:00
|
|
|
char team[5];
|
2008-06-01 22:06:22 +00:00
|
|
|
unsigned int top, bottom;
|
2007-10-02 16:00:38 +00:00
|
|
|
|
|
|
|
// TODO: Sort players so that the leading teams are drawn first
|
2007-07-23 18:52:11 +00:00
|
|
|
k = fragsort[i];
|
|
|
|
s = &cl.players[k];
|
|
|
|
if (!s->name[0])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
y += skip;
|
|
|
|
if (y > vid.height-10)
|
|
|
|
break;
|
|
|
|
|
2007-10-02 16:00:38 +00:00
|
|
|
// Electro's scoreboard eyecandy: Moved this up here for usage with the row background color
|
|
|
|
top = Sbar_TopColour(s);
|
|
|
|
bottom = Sbar_BottomColour(s);
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_newstyle.ival)
|
2007-10-02 16:00:38 +00:00
|
|
|
{
|
|
|
|
// Electro's scoreboard eyecandy: Render the main background transparencies behind players row
|
|
|
|
// TODO: Alpha values on the background
|
|
|
|
if ((cl.teamplay) && (!s->spectator))
|
|
|
|
{
|
|
|
|
int background_color;
|
|
|
|
// Electro's scoreboard eyecandy: red vs blue are common teams, force the colours
|
|
|
|
Q_strncpyz (team, Info_ValueForKey(s->userinfo, "team"), sizeof(team));
|
|
|
|
|
2010-11-20 22:01:16 +00:00
|
|
|
if (S_Voip_Speaking(k))
|
|
|
|
background_color = 0x00ff00;
|
|
|
|
else if (!(strcmp("red", team)))
|
2008-06-01 22:06:22 +00:00
|
|
|
background_color = 4; // forced red
|
2007-10-02 16:00:38 +00:00
|
|
|
else if (!(strcmp("blue", team)))
|
2008-06-01 22:06:22 +00:00
|
|
|
background_color = 13; // forced blue
|
2007-10-02 16:00:38 +00:00
|
|
|
else
|
2008-06-01 22:06:22 +00:00
|
|
|
background_color = bottom;
|
2007-10-02 16:00:38 +00:00
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_FillPCDark (startx - 2, y, rank_width - 3, skip, background_color);
|
2007-10-02 16:00:38 +00:00
|
|
|
}
|
2010-11-20 22:01:16 +00:00
|
|
|
else if (S_Voip_Speaking(k))
|
|
|
|
Sbar_FillPCDark (startx - 2, y, rank_width - 3, skip, 0x00ff00);
|
2007-10-02 16:00:38 +00:00
|
|
|
else
|
2011-03-30 17:34:37 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour (2, 1.0);
|
|
|
|
R2D_FillBlock (startx - 2, y, rank_width - 3, skip);
|
2011-03-30 17:34:37 +00:00
|
|
|
}
|
2007-10-02 16:00:38 +00:00
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour (0, 1.0);
|
|
|
|
R2D_FillBlock (startx - 3, y, 1, skip); // Electro - Border - Left
|
|
|
|
R2D_FillBlock (startx - 3 + rank_width - 2, y, 1, skip); // Electro - Border - Right
|
2007-10-02 16:00:38 +00:00
|
|
|
}
|
|
|
|
|
2007-07-23 18:52:11 +00:00
|
|
|
x = startx;
|
2007-10-02 16:00:38 +00:00
|
|
|
#define COLUMN(title, width, code) \
|
|
|
|
if (showcolumns & (1<<COLUMN##title)) \
|
|
|
|
{ \
|
|
|
|
code \
|
|
|
|
x += width+8; \
|
|
|
|
}
|
2007-07-23 18:52:11 +00:00
|
|
|
ALLCOLUMNS
|
|
|
|
#undef COLUMN
|
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (scr_scoreboard_newstyle.ival)
|
2011-03-30 17:34:37 +00:00
|
|
|
{
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImagePaletteColour (0, 1.0);
|
|
|
|
R2D_FillBlock (startx - 3, y + skip, rank_width - 1, 1); // Electro - Border - Bottom
|
2011-03-30 17:34:37 +00:00
|
|
|
}
|
2007-10-02 16:00:38 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (y >= vid.height-10) // we ran over the screen size, squish
|
|
|
|
largegame = true;
|
2011-03-30 17:34:37 +00:00
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ImageColours(1.0, 1.0, 1.0, 1.0);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
void Sbar_ChatModeOverlay(playerview_t *pv)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int start =0;
|
|
|
|
int i, k, l;
|
|
|
|
int top, bottom;
|
|
|
|
int x, y;
|
|
|
|
player_info_t *s;
|
|
|
|
char team[5];
|
|
|
|
int skip = 10;
|
|
|
|
|
|
|
|
if (largegame)
|
|
|
|
skip = 8;
|
|
|
|
|
|
|
|
// request new ping times every two second
|
2008-01-30 02:32:00 +00:00
|
|
|
if (realtime - cl.last_ping_request > 2 && cls.protocol == CP_QUAKEWORLD && cls.demoplayback != DPB_EZTV)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
cl.last_ping_request = realtime;
|
2008-01-11 15:22:18 +00:00
|
|
|
CL_SendClientCommand(true, "pings");
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-11-26 03:02:55 +00:00
|
|
|
// scores
|
2010-11-21 03:39:12 +00:00
|
|
|
Sbar_SortFrags (true, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (Cam_TrackNum(pv)>=0)
|
|
|
|
Q_strncpyz (team, cl.players[Cam_TrackNum(pv)].team, sizeof(team));
|
|
|
|
else if (pv->playernum>=0 && pv->playernum<MAX_CLIENTS)
|
|
|
|
Q_strncpyz (team, cl.players[pv->playernum].team, sizeof(team));
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
|
|
|
*team = '\0';
|
|
|
|
|
|
|
|
// draw the text
|
|
|
|
l = scoreboardlines;
|
|
|
|
|
|
|
|
if (start)
|
|
|
|
y = start;
|
|
|
|
else
|
|
|
|
y = 24;
|
|
|
|
y = vid.height/2;
|
|
|
|
|
|
|
|
x = 4;
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString ( x , y, "name");
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunString ( x , y, "\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f");
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
|
|
|
|
|
|
|
for (i=0 ; i<l && y <= vid.height-10 ; i++)
|
|
|
|
{
|
|
|
|
k = fragsort[i];
|
|
|
|
s = &cl.players[k];
|
|
|
|
if (!s->name[0])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// draw background
|
2007-07-23 18:52:11 +00:00
|
|
|
top = Sbar_TopColour(s);
|
|
|
|
bottom = Sbar_BottomColour(s);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (largegame)
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_FillPC ( x, y+1, 8*4, 3, top);
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_FillPC ( x, y, 8*4, 4, top);
|
|
|
|
Sbar_FillPC ( x, y+4, 8*4, 4, bottom);
|
2009-11-04 21:16:50 +00:00
|
|
|
/*
|
2013-06-23 02:17:02 +00:00
|
|
|
if (cl.spectator && k == Cam_TrackNum(pv))
|
2005-04-16 16:21:27 +00:00
|
|
|
{
|
|
|
|
Draw_Character ( x, y, 16);
|
2005-09-08 01:59:13 +00:00
|
|
|
Draw_Character ( x+8*3, y, 17);
|
2005-04-16 16:21:27 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
else if (!cl.spectator && k == pv->cl.playernum)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
Draw_Character ( x, y, 16);
|
2005-09-08 01:59:13 +00:00
|
|
|
Draw_Character ( x+8*3, y, 17);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else if (cl.teamplay)
|
|
|
|
{
|
2005-11-01 23:25:15 +00:00
|
|
|
if (!stricmp(s->team, team))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
Draw_Character ( x, y, '[');
|
2005-09-08 01:59:13 +00:00
|
|
|
Draw_Character ( x+8*3, y, ']');
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
*/
|
2004-08-23 00:15:46 +00:00
|
|
|
// draw name
|
|
|
|
if (cl.teamplay)
|
2005-09-08 01:59:13 +00:00
|
|
|
Draw_FunString (x+8*4, y, s->name);
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2005-09-08 01:59:13 +00:00
|
|
|
Draw_FunString (x+8*4, y, s->name);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
y += skip;
|
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (y >= vid.height-10) // we ran over the screen size, squish
|
|
|
|
largegame = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
Sbar_MiniDeathmatchOverlay
|
|
|
|
|
|
|
|
frags name
|
|
|
|
frags team name
|
|
|
|
displayed to right of status bar if there's room
|
|
|
|
==================
|
|
|
|
*/
|
2013-06-23 02:17:02 +00:00
|
|
|
static void Sbar_MiniDeathmatchOverlay (playerview_t *pv)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i, k;
|
|
|
|
int top, bottom;
|
2009-11-04 21:16:50 +00:00
|
|
|
int x, y, f, px, py;
|
2004-08-23 00:15:46 +00:00
|
|
|
char num[12];
|
|
|
|
player_info_t *s;
|
|
|
|
int numlines;
|
2005-02-06 02:47:36 +00:00
|
|
|
char name[64+1];
|
2004-08-23 00:15:46 +00:00
|
|
|
team_t *tm;
|
|
|
|
|
2005-11-26 03:02:55 +00:00
|
|
|
// scores
|
2010-11-21 03:39:12 +00:00
|
|
|
Sbar_SortFrags (false, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (sbar_rect.width >= 640)
|
2013-06-23 02:17:02 +00:00
|
|
|
Sbar_SortTeams(pv);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (!scoreboardlines)
|
|
|
|
return; // no one there?
|
|
|
|
|
|
|
|
// draw the text
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
y = sbar_rect.y + sbar_rect.height - sb_lines - 1;
|
2004-08-23 00:15:46 +00:00
|
|
|
numlines = sb_lines/8;
|
|
|
|
if (numlines < 3)
|
|
|
|
return; // not enough room
|
|
|
|
|
|
|
|
// find us
|
|
|
|
for (i=0 ; i < scoreboardlines; i++)
|
2013-06-23 02:17:02 +00:00
|
|
|
if (fragsort[i] == pv->playernum)
|
2004-08-23 00:15:46 +00:00
|
|
|
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;
|
|
|
|
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
x = sbar_rect.x + 320 + 4;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
for (/* */ ; i < scoreboardlines && y < sbar_rect.y + sbar_rect.height - 8 + 1; i++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
k = fragsort[i];
|
|
|
|
s = &cl.players[k];
|
|
|
|
if (!s->name[0])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// draw ping
|
2007-07-23 18:52:11 +00:00
|
|
|
top = Sbar_TopColour(s);
|
|
|
|
bottom = Sbar_BottomColour(s);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2008-06-01 22:06:22 +00:00
|
|
|
Sbar_FillPC ( x, y+1, 40, 3, top);
|
|
|
|
Sbar_FillPC ( x, y+4, 40, 4, bottom);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw number
|
|
|
|
f = s->frags;
|
|
|
|
sprintf (num, "%3i",f);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_BeginString(font_conchar, x+8, y, &px, &py);
|
|
|
|
Font_DrawChar ( px, py, num[0] | 0xe000 | CON_WHITEMASK);
|
|
|
|
Font_BeginString(font_conchar, x+16, y, &px, &py);
|
|
|
|
Font_DrawChar ( px, py, num[1] | 0xe000 | CON_WHITEMASK);
|
|
|
|
Font_BeginString(font_conchar, x+24, y, &px, &py);
|
|
|
|
Font_DrawChar ( px, py, num[2] | 0xe000 | CON_WHITEMASK);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if ((cl.spectator && k == pv->cam_spec_track) ||
|
|
|
|
(!cl.spectator && k == pv->playernum))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Font_BeginString(font_conchar, x, y, &px, &py);
|
|
|
|
Font_DrawChar ( px, py, 16 | 0xe000 | CON_WHITEMASK);
|
|
|
|
Font_BeginString(font_conchar, x+32, y, &px, &py);
|
|
|
|
Font_DrawChar ( px, py, 17 | 0xe000 | CON_WHITEMASK);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2005-02-06 02:47:36 +00:00
|
|
|
Q_strncpyz(name, s->name, sizeof(name));
|
|
|
|
// team and name
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cl.teamplay)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth (x+48, y, s->team, 32);
|
|
|
|
Draw_FunStringWidth (x+48+40, y, name, MAX_DISPLAYEDNAME*8);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth (x+48, y, name, MAX_DISPLAYEDNAME*8);
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
// draw teams if room
|
|
|
|
if (sbar_rect.width < 640 || !cl.teamplay)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// draw seperator
|
|
|
|
x += 208;
|
2009-11-04 21:16:50 +00:00
|
|
|
// for (y = sbar_rect.height - sb_lines; y < sbar_rect.height - 6; y += 2)
|
|
|
|
// Draw_ColouredCharacter(x, y, CON_WHITEMASK|14);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
x += 16;
|
|
|
|
|
|
|
|
y = sbar_rect.height - sb_lines;
|
|
|
|
for (i=0 ; i < scoreboardteams && y <= sbar_rect.height; i++)
|
|
|
|
{
|
|
|
|
k = teamsort[i];
|
|
|
|
tm = teams + k;
|
|
|
|
|
|
|
|
// draw pings
|
2009-11-04 21:16:50 +00:00
|
|
|
Draw_FunStringWidth (x, y, tm->team, 32);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// draw total
|
|
|
|
sprintf (num, "%5i", tm->frags);
|
2005-02-06 02:47:36 +00:00
|
|
|
Draw_FunString(x + 40, y, num);
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!strncmp(cl.players[pv->playernum].team, tm->team, 16))
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
Font_BeginString(font_conchar, x-8, y, &px, &py);
|
|
|
|
Font_DrawChar(px, py, 16|0xe000|CON_WHITEMASK);
|
|
|
|
Font_BeginString(font_conchar, x+32, y, &px, &py);
|
|
|
|
Font_DrawChar(px, py, 17|0xe000|CON_WHITEMASK);
|
|
|
|
Font_EndString(font_conchar);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2005-11-26 03:02:55 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
y += 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void Sbar_CoopIntermission (void)
|
|
|
|
{
|
2004-12-24 08:45:56 +00:00
|
|
|
mpic_t *pic;
|
2004-08-23 00:15:46 +00:00
|
|
|
int dig;
|
|
|
|
int num;
|
2012-07-05 19:42:36 +00:00
|
|
|
int pnum = 0; //should be the same for all players.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2007-05-25 22:16:29 +00:00
|
|
|
sbar_rect.width = vid.width;
|
|
|
|
sbar_rect.height = vid.height;
|
|
|
|
sbar_rect.x = 0;
|
|
|
|
sbar_rect.y = 0;
|
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
pic = R2D_SafeCachePic ("gfx/complete.lmp");
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!pic)
|
|
|
|
return;
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 64, (sbar_rect.height - 200)/2 + 24, 192, 24, pic);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2011-03-31 01:14:01 +00:00
|
|
|
pic = R2D_SafeCachePic ("gfx/inter.lmp");
|
2006-04-02 08:11:17 +00:00
|
|
|
if (pic)
|
2011-03-31 01:14:01 +00:00
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 0, (sbar_rect.height - 200)/2 + 56, 160, 144, pic);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// time
|
|
|
|
dig = cl.completed_time/60;
|
2012-09-30 05:52:03 +00:00
|
|
|
Sbar_IntermissionNumber ((sbar_rect.width - 320)/2 + 230 - 24*4, (sbar_rect.height - 200)/2 + 64, dig, 4, 0, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
num = cl.completed_time - dig*60;
|
2012-09-30 05:52:03 +00:00
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 230,(sbar_rect.height - 200)/2 + 64, 16, 24, sb_colon);
|
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 254,(sbar_rect.height - 200)/2 + 64, 16, 26, sb_nums[0][num/10]);
|
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 278,(sbar_rect.height - 200)/2 + 64, 16, 24, sb_nums[0][num%10]);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
//it is assumed that secrits/monsters are going to be constant for any player...
|
2012-09-30 05:52:03 +00:00
|
|
|
Sbar_IntermissionNumber ((sbar_rect.width - 320)/2 + 230 - 24*4, (sbar_rect.height - 200)/2 + 104, cl.playerview[pnum].stats[STAT_SECRETS], 4, 0, false);
|
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 230, (sbar_rect.height - 200)/2 + 104, 16, 24, sb_slash);
|
|
|
|
Sbar_IntermissionNumber ((sbar_rect.width - 320)/2 + 254, (sbar_rect.height - 200)/2 + 104, cl.playerview[pnum].stats[STAT_TOTALSECRETS], 4, 0, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2012-09-30 05:52:03 +00:00
|
|
|
Sbar_IntermissionNumber ((sbar_rect.width - 320)/2 + 230 - 24*4, (sbar_rect.height - 200)/2 + 144, cl.playerview[pnum].stats[STAT_MONSTERS], 4, 0, false);
|
|
|
|
R2D_ScalePic ((sbar_rect.width - 320)/2 + 230,(sbar_rect.height - 200)/2 + 144, 16, 24, sb_slash);
|
|
|
|
Sbar_IntermissionNumber ((sbar_rect.width - 320)/2 + 254, (sbar_rect.height - 200)/2 + 144, cl.playerview[pnum].stats[STAT_TOTALMONSTERS], 4, 0, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
Sbar_IntermissionOverlay
|
|
|
|
|
|
|
|
==================
|
|
|
|
*/
|
|
|
|
void Sbar_IntermissionOverlay (void)
|
|
|
|
{
|
2005-09-09 23:40:55 +00:00
|
|
|
#ifdef VM_UI
|
2004-08-23 00:15:46 +00:00
|
|
|
if (UI_DrawIntermission()>0)
|
|
|
|
return;
|
2005-09-09 23:40:55 +00:00
|
|
|
#endif
|
2007-05-25 22:16:29 +00:00
|
|
|
|
|
|
|
Sbar_Start();
|
|
|
|
|
2013-03-12 22:53:23 +00:00
|
|
|
if (!cls.deathmatch)
|
2004-08-23 00:15:46 +00:00
|
|
|
Sbar_CoopIntermission();
|
|
|
|
else if (cl.teamplay > 0 && !sb_showscores)
|
|
|
|
Sbar_TeamOverlay ();
|
|
|
|
else
|
|
|
|
Sbar_DeathmatchOverlay (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
Sbar_FinaleOverlay
|
|
|
|
|
|
|
|
==================
|
|
|
|
*/
|
|
|
|
void Sbar_FinaleOverlay (void)
|
|
|
|
{
|
2005-09-09 23:40:55 +00:00
|
|
|
#ifdef VM_UI
|
2004-08-23 00:15:46 +00:00
|
|
|
if (UI_DrawFinale()>0)
|
|
|
|
return;
|
2005-09-09 23:40:55 +00:00
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|