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"
2013-03-12 22:48:09 +00:00
# define CON_ALTMASK (CON_2NDCHARSETTEXT|CON_WHITEMASK)
2010-07-11 02:22:39 +00:00
2015-09-01 04:45:15 +00:00
# ifdef QUAKEHUD
extern cvar_t * hud_tracking_show ;
2015-11-18 07:37:39 +00:00
extern cvar_t * hud_miniscores_show ;
2015-09-01 04:45:15 +00:00
2015-06-22 11:49:15 +00:00
cvar_t scr_scoreboard_drawtitle = CVARD ( " scr_scoreboard_drawtitle " , " 1 " , " Wastes screen space when looking at the scoreboard. " ) ;
cvar_t scr_scoreboard_forcecolors = CVARD ( " scr_scoreboard_forcecolors " , " 0 " , " Makes the scoreboard colours obey enemycolor/teamcolor rules. " ) ; //damn americans
cvar_t scr_scoreboard_newstyle = CVARD ( " scr_scoreboard_newstyle " , " 1 " , " Display team colours and stuff in a style popularised by Electro. Looks more modern, but might not quite fit classic huds. " ) ; // New scoreboard style ported from Electro, by Molgrum
2015-06-16 23:53:58 +00:00
cvar_t scr_scoreboard_showfrags = CVARD ( " scr_scoreboard_showfrags " , " 0 " , " Display kills+deaths+teamkills, as determined by fragfile.dat-based conprint parsing. These may be inaccurate if you join mid-game. " ) ;
cvar_t scr_scoreboard_showflags = CVARD ( " scr_scoreboard_showflags " , " 2 " , " Display flag caps+touches on the scoreboard, where our fragfile.dat supports them. \n 0: off \n 1: on \n 2: on only if someone appears to have interacted with a flag. " ) ;
2015-06-22 11:49:15 +00:00
cvar_t scr_scoreboard_fillalpha = CVARD ( " scr_scoreboard_fillalpha " , " 0.7 " , " Transparency amount for newstyle scoreboard. " ) ;
2020-02-11 18:06:10 +00:00
cvar_t scr_scoreboard_backgroundalpha = CVARD ( " scr_scoreboard_backgroundalpha " , " 0.5 " , " Further multiplier for the background alphas. " ) ;
2015-06-22 11:49:15 +00:00
cvar_t scr_scoreboard_teamscores = CVARD ( " scr_scoreboard_teamscores " , " 1 " , " Makes +showscores act as +showteamscores. Because reasons. " ) ;
cvar_t scr_scoreboard_teamsort = CVARD ( " scr_scoreboard_teamsort " , " 0 " , " On the scoreboard, sort players by their team BEFORE their personal score. " ) ;
2016-09-08 19:04:35 +00:00
cvar_t scr_scoreboard_titleseperator = CVAR ( " scr_scoreboard_titleseperator " , " 1 " ) ;
2021-04-14 05:21:04 +00:00
cvar_t scr_scoreboard_showruleset = CVAR ( " scr_scoreboard_showruleset " , " 1 " ) ;
2015-06-22 11:49:15 +00:00
cvar_t sbar_teamstatus = CVARD ( " sbar_teamstatus " , " 1 " , " Display the last team say from each of your team members just above the sbar area. " ) ;
2007-07-23 18:52:11 +00:00
2021-05-09 13:01:29 +00:00
cvar_t cl_sbaralpha = CVARAFD ( " cl_sbaralpha " , " 0.75 " , " scr_sbaralpha " , CVAR_ARCHIVE , " Specifies the transparency of the status bar. Only Takes effect when cl_sbar is set to 2. " ) ; //with premultiplied alpha, this needs to affect the RGB values too.
2017-07-04 05:07:51 +00:00
2004-08-23 00:15:46 +00:00
//===========================================
//rogue changed and added defines
2014-09-03 16:06:23 +00:00
# define RIT_SHELLS (1u<<7)
# define RIT_NAILS (1u<<8)
# define RIT_ROCKETS (1u<<9)
# define RIT_CELLS (1u<<10)
# define RIT_AXE (1u<<11)
# define RIT_LAVA_NAILGUN (1u<<12)
# define RIT_LAVA_SUPER_NAILGUN (1u<<13)
# define RIT_MULTI_GRENADE (1u<<14)
# define RIT_MULTI_ROCKET (1u<<15)
# define RIT_PLASMA_GUN (1u<<16)
# define RIT_ARMOR1 (1u<<23)
# define RIT_ARMOR2 (1u<<24)
# define RIT_ARMOR3 (1u<<25)
# define RIT_LAVA_NAILS (1u<<26)
# define RIT_PLASMA_AMMO (1u<<27)
# define RIT_MULTI_ROCKETS (1u<<28)
# define RIT_SHIELD (1u<<29)
# define RIT_ANTIGRAV (1u<<30)
# define RIT_SUPERHEALTH (1u<<31)
2004-08-23 00:15:46 +00:00
//===========================================
//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
2015-08-04 15:16:24 +00:00
static apic_t * sb_nums [ 2 ] [ 11 ] ;
static apic_t * sb_colon , * sb_slash ;
static apic_t * sb_ibar ;
static apic_t * sb_sbar ;
static apic_t * sb_scorebar ;
2020-02-11 18:06:10 +00:00
apic_t * sb_weapons [ 7 ] [ 8 ] ; // 0 is active, 1 is owned, 2-5 are flashes
2015-08-04 15:16:24 +00:00
static apic_t * sb_ammo [ 4 ] ;
static apic_t * sb_sigil [ 4 ] ;
static apic_t * sb_armor [ 3 ] ;
static apic_t * sb_items [ 32 ] ;
static apic_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
2015-08-04 15:16:24 +00:00
static apic_t * sb_face_invis ;
static apic_t * sb_face_quad ;
static apic_t * sb_face_invuln ;
static apic_t * sb_face_invis_invuln ;
2004-08-23 00:15:46 +00:00
//rogue pictures.
2015-08-04 15:16:24 +00:00
static qboolean sbar_rogue ;
static apic_t * rsb_invbar [ 2 ] ;
static apic_t * rsb_weapons [ 5 ] ;
static apic_t * rsb_items [ 2 ] ;
static apic_t * rsb_ammo [ 3 ] ;
static apic_t * rsb_teambord ;
2004-08-23 00:15:46 +00:00
//all must be found for any to be used.
2014-09-03 16:06:23 +00:00
//hipnotic pictures and stuff
2015-08-04 15:16:24 +00:00
static qboolean sbar_hipnotic ;
static apic_t * hsb_weapons [ 7 ] [ 5 ] ; // 0 is active, 1 is owned, 2-5 are flashes
static int hipweapons [ 4 ] = { HIT_LASER_CANNON_BIT , HIT_MJOLNIR_BIT , 4 , HIT_PROXIMITY_GUN_BIT } ;
static apic_t * hsb_items [ 2 ] ;
2014-09-03 16:06:23 +00:00
//end hipnotic
2016-07-12 00:40:13 +00:00
static qboolean sbarfailed ;
2014-09-17 03:04:08 +00:00
# ifdef HEXEN2
2016-07-12 00:40:13 +00:00
static qboolean sbar_hexen2 ;
2014-09-17 03:04:08 +00:00
# endif
2004-08-23 00:15:46 +00:00
vrect_t sbar_rect ; //screen area that the sbar must fit.
2014-09-03 16:06:23 +00:00
float sbar_rect_left ;
2004-08-23 00:15:46 +00:00
int sb_lines ; // scan lines to draw
2017-05-28 15:42:32 +00:00
void Sbar_DeathmatchOverlay ( playerview_t * pv , int start ) ;
void Sbar_TeamOverlay ( playerview_t * pv ) ;
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
2016-07-12 00:40:13 +00:00
static int Sbar_PlayerNum ( playerview_t * pv )
2007-07-23 18:52:11 +00:00
{
int num ;
2017-05-28 15:42:32 +00:00
num = pv - > 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 ;
}
2016-07-12 00:40:13 +00:00
static int Sbar_TopColour ( player_info_t * p )
2007-07-23 18:52:11 +00:00
{
2015-04-14 23:12:17 +00:00
if ( cl . teamfortress )
{
if ( ! Q_strcasecmp ( p - > team , " red " ) )
return 4 ;
if ( ! Q_strcasecmp ( p - > team , " blue " ) )
return 13 ;
}
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 ;
}
2016-07-12 00:40:13 +00:00
static int Sbar_BottomColour ( player_info_t * p )
2007-07-23 18:52:11 +00:00
{
2015-04-14 23:12:17 +00:00
if ( cl . teamfortress )
{
if ( ! Q_strcasecmp ( p - > team , " red " ) )
return 4 ;
if ( ! Q_strcasecmp ( p - > team , " blue " ) )
return 13 ;
}
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 ;
}
2015-09-01 04:45:15 +00:00
# endif
2009-11-04 21:16:50 +00:00
//Draws a pre-marked-up string with no width limit. doesn't support new lines
2019-01-13 16:51:50 +00:00
void Draw_ExpandedString ( struct font_s * font , float x , float y , conchar_t * str )
2005-01-04 07:31:57 +00:00
{
2013-08-27 13:18:09 +00:00
int px , py ;
2015-07-14 14:47:00 +00:00
unsigned int codeflags , codepoint ;
2019-01-13 16:51:50 +00:00
Font_BeginString ( font , x , y , & px , & py ) ;
2005-01-04 07:31:57 +00:00
while ( * str )
{
2015-07-14 14:47:00 +00:00
str = Font_Decode ( str , & codeflags , & codepoint ) ;
px = Font_DrawChar ( px , py , codeflags , codepoint ) ;
2005-01-04 07:31:57 +00:00
}
2019-01-13 16:51:50 +00:00
Font_EndString ( font ) ;
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
2013-08-27 13:18:09 +00:00
void Draw_FunString ( float x , float 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
2019-01-13 16:51:50 +00:00
Draw_ExpandedString ( font_default , x , y , buffer ) ;
2009-05-24 10:11:17 +00:00
}
2009-11-04 21:16:50 +00:00
//Draws a marked up string using the alt char set (legacy mode would be |128)
2013-08-27 13:18:09 +00:00
void Draw_AltFunString ( float x , float 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
2019-01-13 16:51:50 +00:00
Draw_ExpandedString ( font_default , x , y , buffer ) ;
2009-11-04 21:16:50 +00:00
}
//Draws a marked up string no wider than $width virtual pixels.
2020-04-19 01:23:32 +00:00
void Draw_FunStringWidthFont ( struct font_s * font , float x , float y , const void * str , int width , int rightalign , qboolean highlight )
2009-11-04 21:16:50 +00:00
{
conchar_t buffer [ 2048 ] ;
2013-10-29 17:38:22 +00:00
conchar_t * w ;
2013-08-27 13:18:09 +00:00
int px , py ;
2013-10-29 17:38:22 +00:00
int fw = 0 ;
2015-07-14 14:47:00 +00:00
unsigned int codeflags , codepoint ;
2009-11-04 21:16:50 +00:00
2017-01-22 17:10:25 +00:00
//be generous and round up, to avoid too many issues with truncations
width = ceil ( ( width * ( float ) vid . rotpixelwidth ) / vid . width ) ;
2009-11-04 21:16:50 +00:00
2016-07-12 00:40:13 +00:00
codeflags = ( highlight & 1 ) ? CON_ALTMASK : CON_WHITEMASK ;
if ( highlight & 2 )
codeflags | = CON_BLINKTEXT ;
COM_ParseFunString ( codeflags , str , buffer , sizeof ( buffer ) , false ) ;
2009-11-04 21:16:50 +00:00
2020-04-19 01:23:32 +00:00
Font_BeginString ( font , x , y , & px , & py ) ;
2013-10-29 17:38:22 +00:00
if ( rightalign )
{
2015-07-14 14:47:00 +00:00
for ( w = buffer ; * w ; )
2013-10-29 17:38:22 +00:00
{
2015-07-14 14:47:00 +00:00
w = Font_Decode ( w , & codeflags , & codepoint ) ;
fw + = Font_CharWidth ( codeflags , codepoint ) ;
2013-10-29 17:38:22 +00:00
}
2015-01-21 18:18:37 +00:00
if ( rightalign = = 2 )
{
if ( fw < width )
{
px + = ( width - fw ) / 2 ;
width = fw ;
}
}
else
{
px + = width ;
if ( fw > width )
fw = width ;
px - = fw ;
}
2013-10-29 17:38:22 +00:00
}
2015-07-14 14:47:00 +00:00
for ( w = buffer ; * w ; )
2009-11-04 21:16:50 +00:00
{
2015-07-14 14:47:00 +00:00
w = Font_Decode ( w , & codeflags , & codepoint ) ;
width - = Font_CharWidth ( codeflags , codepoint ) ;
2009-11-04 21:16:50 +00:00
if ( width < 0 )
return ;
2015-07-14 14:47:00 +00:00
px = Font_DrawChar ( px , py , codeflags , codepoint ) ;
2009-11-04 21:16:50 +00:00
}
2020-04-19 01:23:32 +00:00
Font_EndString ( font ) ;
2009-11-04 21:16:50 +00:00
}
2015-09-01 04:45:15 +00:00
# ifdef QUAKEHUD
2005-02-06 02:47:36 +00:00
2004-08-23 00:15:46 +00:00
static qboolean largegame = false ;
# ifdef Q2CLIENT
2013-08-27 13:18:09 +00:00
static void DrawHUDString ( char * string , float x , float y , int centerwidth , qboolean alt )
2004-08-23 00:15:46 +00:00
{
2015-04-27 06:19:33 +00:00
vec2_t fontscale = { 8 , 8 } ;
R_DrawTextField ( x , y , centerwidth , 1024 , string , alt ? CON_ALTMASK : CON_WHITEMASK , CPRINT_TALIGN , font_default , fontscale ) ;
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 )
{
2019-01-13 16:51:50 +00:00
mpic_t * pic = R2D_SafeCachePic ( va ( " pics/%s.pcx " , name ) ) ;
# if defined(IMAGEFMT_PCX)
int xmin , ymin , swidth , sheight ;
size_t length ;
pcx_t * pcx = ( pcx_t * ) COM_LoadTempFile ( va ( " pics/%s.pcx " , name ) , 0 , & length ) ;
if ( pcx & & length > = sizeof ( * pcx ) )
{
xmin = LittleShort ( pcx - > xmin ) ;
ymin = LittleShort ( pcx - > ymin ) ;
swidth = LittleShort ( pcx - > xmax ) - xmin + 1 ;
sheight = LittleShort ( pcx - > ymax ) - ymin + 1 ;
if ( pcx - > manufacturer = = 0x0a
& & pcx - > version = = 5
& & pcx - > encoding = = 1
& & pcx - > bits_per_pixel = = 8
& & swidth < = 1024
& & sheight < = 1024 )
{
pic - > width = swidth ;
pic - > height = sheight ;
}
}
# endif
return pic ;
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
2013-09-29 17:14:33 +00:00
static void SCR_DrawField ( float x , float y , int color , float 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 ;
2014-10-05 20:04:11 +00:00
int pw , ph ;
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 ] ) ;
2014-10-05 20:04:11 +00:00
if ( p & & R_GetShaderSizes ( p , & pw , & ph , false ) > 0 )
R2D_ScalePic ( x , y , pw , ph , 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 )
2015-03-03 00:14:43 +00:00
return cl . image_name [ i - Q2CS_IMAGES ] ? cl . image_name [ i - Q2CS_IMAGES ] : " " ;
if ( i > = Q2CS_ITEMS & & i < Q2CS_ITEMS + Q2MAX_ITEMS )
return cl . item_name [ i - Q2CS_ITEMS ] ? cl . item_name [ i - Q2CS_ITEMS ] : " " ;
2004-08-23 00:15:46 +00:00
if ( i = = Q2CS_STATUSBAR )
return cl . q2statusbar ;
2015-12-28 17:41:39 +00:00
if ( i = = Q2CS_NAME )
return cl . levelname ;
2004-08-23 00:15:46 +00:00
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 )
2016-01-18 05:22:07 +00:00
return cl . sound_name [ i - Q2CS_SOUNDS ] ;
2010-07-11 02:22:39 +00:00
if ( i = = Q2CS_AIRACCEL )
2018-07-05 16:21:44 +00:00
return cl . q2airaccel ;
2015-12-28 17:41:39 +00:00
if ( i > = Q2CS_PLAYERSKINS & & i < Q2CS_GENERAL + Q2MAX_GENERAL )
return cl . configstring_general [ i - Q2CS_PLAYERSKINS ] ? cl . configstring_general [ i - Q2CS_PLAYERSKINS ] : " " ;
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 " " ;
}
2016-01-18 05:22:07 +00:00
void Sbar_ExecuteLayoutString ( char * s , int seat )
2004-08-23 00:15:46 +00:00
{
int x , y ;
int value ;
int width ;
int index ;
2014-10-05 20:04:11 +00:00
int pw , ph ;
2004-08-23 00:15:46 +00:00
// q2clientinfo_t *ci;
2009-11-04 21:16:50 +00:00
mpic_t * p ;
2016-01-18 05:22:07 +00:00
q2player_state_t * ps = & cl . q2frame . playerstate [ seat ] ;
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 ) ;
2014-10-05 20:04:11 +00:00
x = sbar_rect . x + ( sbar_rect . width - 320 ) / 2 + 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 ) ;
2014-10-05 20:04:11 +00:00
y = sbar_rect . y + ( sbar_rect . height - 240 ) / 2 + 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 ) ;
2016-01-18 05:22:07 +00:00
value = ps - > stats [ atoi ( com_token ) ] ;
2004-08-23 00:15:46 +00:00
if ( value > = Q2MAX_IMAGES | | value < 0 )
Host_EndGame ( " Pic >= Q2MAX_IMAGES " ) ;
2015-03-03 00:14:43 +00:00
if ( * Get_Q2ConfigString ( Q2CS_IMAGES + value ) )
2004-08-23 00:15:46 +00:00
{
// 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 ) ) ;
2014-10-05 20:04:11 +00:00
if ( p & & R_GetShaderSizes ( p , & pw , & ph , false ) > 0 )
R2D_ScalePic ( x , y , pw , ph , 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 ) ;
2016-01-18 05:22:07 +00:00
x = sbar_rect . x + sbar_rect . width / 2 - 160 + atoi ( com_token ) ;
2004-08-23 00:15:46 +00:00
s = COM_Parse ( s ) ;
2016-01-18 05:22:07 +00:00
y = sbar_rect . y + sbar_rect . height / 2 - 120 + atoi ( com_token ) ;
2004-08-23 00:15:46 +00:00
// 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 " ) ;
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
2018-07-05 16:21:44 +00:00
p = R2D_SafeCachePic ( va ( " players/%s_i.pcx " , InfoBuf_ValueForKey ( & cl . players [ value ] . userinfo , " skin " ) ) ) ;
2014-10-05 20:04:11 +00:00
if ( ! p | | ! R_GetShaderSizes ( p , NULL , NULL , false ) ) //display a default if the icon couldn't be found.
2014-08-25 07:35:41 +00:00
p = R2D_SafeCachePic ( " players/male/grunt_i.pcx " ) ;
2014-05-10 13:42:13 +00:00
R2D_ScalePic ( x , y , 32 , 32 , p ) ;
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 ) ;
2016-01-18 05:22:07 +00:00
x = sbar_rect . x + sbar_rect . width / 2 - 160 + atoi ( com_token ) ;
2004-08-23 00:15:46 +00:00
s = COM_Parse ( s ) ;
2016-01-18 05:22:07 +00:00
y = sbar_rect . y + sbar_rect . height / 2 - 120 + atoi ( com_token ) ;
2004-08-23 00:15:46 +00:00
// 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 " ) ;
s = COM_Parse ( s ) ;
score = atoi ( com_token ) ;
s = COM_Parse ( s ) ;
ping = atoi ( com_token ) ;
if ( ping > 999 )
ping = 999 ;
2014-05-10 13:42:13 +00:00
sprintf ( block , " %3d %3d %-12.12s " , score , ping , cl . players [ value ] . name ) ;
2004-08-23 00:15:46 +00:00
// 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 ) ;
2014-10-05 20:04:11 +00:00
if ( p & & R_GetShaderSizes ( p , & pw , & ph , false ) > 0 )
R2D_ScalePic ( x , y , pw , ph , 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 ) ;
2016-01-18 05:22:07 +00:00
value = ps - > stats [ atoi ( com_token ) ] ;
2004-08-23 00:15:46 +00:00
SCR_DrawField ( x , y , 0 , width , value ) ;
continue ;
}
if ( ! strcmp ( com_token , " hnum " ) )
{ // health number
int color ;
width = 3 ;
2016-01-18 05:22:07 +00:00
value = ps - > stats [ Q2STAT_HEALTH ] ;
2004-08-23 00:15:46 +00:00
if ( value > 25 )
color = 0 ; // green
else if ( value > 0 )
color = ( cl . q2frame . serverframe > > 2 ) & 1 ; // flash
else
color = 1 ;
2016-01-18 05:22:07 +00:00
if ( ps - > 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 " ) ;
2014-10-05 20:04:11 +00:00
if ( p & & R_GetShaderSizes ( p , & pw , & ph , false ) > 0 )
R2D_ScalePic ( x , y , pw , ph , 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 ;
2016-01-18 05:22:07 +00:00
value = ps - > stats [ Q2STAT_AMMO ] ;
2004-08-23 00:15:46 +00:00
if ( value > 5 )
color = 0 ; // green
else if ( value > = 0 )
color = ( cl . q2frame . serverframe > > 2 ) & 1 ; // flash
else
continue ; // negative number = don't show
2016-01-18 05:22:07 +00:00
if ( ps - > 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 " ) ;
2014-10-05 20:04:11 +00:00
if ( p & & R_GetShaderSizes ( p , & pw , & ph , false ) > 0 )
R2D_ScalePic ( x , y , pw , ph , 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 ;
2016-01-18 05:22:07 +00:00
value = ps - > stats [ Q2STAT_ARMOR ] ;
2004-08-23 00:15:46 +00:00
if ( value < 1 )
continue ;
color = 0 ; // green
2016-01-18 05:22:07 +00:00
if ( ps - > 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 " ) ;
2016-01-18 05:22:07 +00:00
index = ps - > stats [ index ] ;
2004-08-23 00:15:46 +00:00
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 ) ;
2016-01-18 05:22:07 +00:00
value = ps - > stats [ atoi ( com_token ) ] ;
2004-08-23 00:15:46 +00:00
if ( ! value )
{ // skip to endif
while ( s & & strcmp ( com_token , " endif " ) )
{
s = COM_Parse ( s ) ;
}
}
continue ;
}
}
}
2015-03-03 00:14:43 +00:00
2016-01-18 05:22:07 +00:00
static void Sbar_Q2DrawInventory ( int seat )
2015-03-03 00:14:43 +00:00
{
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
int keys [ 1 ] , keymods [ 1 ] ;
2015-03-03 00:14:43 +00:00
char cmd [ 1024 ] ;
const char * boundkey ;
2016-01-18 05:22:07 +00:00
q2player_state_t * ps = & cl . q2frame . playerstate [ seat ] ;
unsigned int validlist [ Q2MAX_ITEMS ] , rows , i , item , selected = ps - > stats [ Q2STAT_SELECTED_ITEM ] ;
2015-03-03 00:14:43 +00:00
int first ;
unsigned int maxrows = ( ( 240 - 24 * 2 - 8 * 2 ) / 8 ) ;
//draw background
2016-01-18 05:22:07 +00:00
float x = sbar_rect . x + ( sbar_rect . width - 256 ) / 2 ;
float y = sbar_rect . y + ( sbar_rect . height - 240 ) / 2 ;
if ( y < sbar_rect . y )
y = sbar_rect . y ; //try to fix small-res 3-way splitscreen slightly
2015-03-03 00:14:43 +00:00
R2D_ScalePic ( x , y , 256 , 240 , Sbar_Q2CachePic ( " inventory " ) ) ;
//move into the frame
x + = 24 ;
y + = 24 ;
//figure out which items we have
for ( i = 0 , rows = 0 , first = - 1 ; i < Q2MAX_ITEMS ; i + + )
{
2016-01-18 05:22:07 +00:00
if ( ! cl . inventory [ seat ] [ i ] )
2015-03-03 00:14:43 +00:00
continue ;
if ( i < = selected )
first = rows ;
validlist [ rows + + ] = i ;
}
first - = maxrows / 2 ;
first = min ( first , ( signed ) ( rows - maxrows ) ) ;
first = max ( 0 , first ) ;
rows = min ( rows , first + maxrows ) ;
//match q2, because why not.
Draw_FunString ( x , y , " hotkey ### item " ) ; y + = 8 ;
Draw_FunString ( x , y , " ------ --- ---- " ) ; y + = 8 ;
for ( i = first ; i < rows ; i + + )
{
item = validlist [ i ] ;
Q_snprintfz ( cmd , sizeof ( cmd ) , " use %s " , Get_Q2ConfigString ( Q2CS_ITEMS + item ) ) ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
if ( ! M_FindKeysForCommand ( 0 , 0 , cmd , keys , keymods , countof ( keys ) ) )
2015-03-03 00:14:43 +00:00
boundkey = " " ; //we don't actually know which ones can be selected at all.
else
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
boundkey = Key_KeynumToString ( keys [ 0 ] , keymods [ 0 ] ) ;
2015-03-03 00:14:43 +00:00
2016-01-18 05:22:07 +00:00
Q_snprintfz ( cmd , sizeof ( cmd ) , " %6s %3i %s " , boundkey , cl . inventory [ seat ] [ item ] , Get_Q2ConfigString ( Q2CS_ITEMS + item ) ) ;
2015-03-03 00:14:43 +00:00
Draw_FunStringWidth ( x , y , cmd , 256 - 24 * 2 + 8 , false , item ! = selected ) ; y + = 8 ;
}
}
2004-08-23 00:15:46 +00:00
# endif
/*
= = = = = = = = = = = = = = =
Sbar_ShowTeamScores
Tab key down
= = = = = = = = = = = = = = =
*/
void Sbar_ShowTeamScores ( void )
{
2017-05-28 15:42:32 +00:00
int seat = CL_TargettedSplit ( false ) ;
if ( cl . playerview [ seat ] . sb_showteamscores )
2004-08-23 00:15:46 +00:00
return ;
2005-10-16 03:57:01 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2018-01-22 19:18:04 +00:00
; //return;
2005-10-16 03:57:01 +00:00
# endif
2017-05-28 15:42:32 +00:00
cl . playerview [ seat ] . sb_showteamscores = true ;
2004-08-23 00:15:46 +00:00
sb_updates = 0 ;
}
/*
= = = = = = = = = = = = = = =
Sbar_DontShowTeamScores
Tab key up
= = = = = = = = = = = = = = =
*/
void Sbar_DontShowTeamScores ( void )
{
2017-05-28 15:42:32 +00:00
int seat = CL_TargettedSplit ( false ) ;
cl . playerview [ seat ] . sb_showteamscores = false ;
2004-08-23 00:15:46 +00:00
sb_updates = 0 ;
2005-10-16 03:57:01 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2005-10-16 03:57:01 +00:00
return ;
# endif
2004-08-23 00:15:46 +00:00
}
/*
= = = = = = = = = = = = = = =
Sbar_ShowScores
Tab key down
= = = = = = = = = = = = = = =
*/
void Sbar_ShowScores ( void )
{
2017-05-28 15:42:32 +00:00
int seat = CL_TargettedSplit ( false ) ;
2009-11-04 21:16:50 +00:00
if ( scr_scoreboard_teamscores . ival )
2007-10-02 16:00:38 +00:00
{
Sbar_ShowTeamScores ( ) ;
return ;
}
2017-05-28 15:42:32 +00:00
if ( cl . playerview [ seat ] . sb_showscores )
2004-08-23 00:15:46 +00:00
return ;
2005-10-16 03:57:01 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2018-01-22 19:18:04 +00:00
; //return;
2005-10-16 03:57:01 +00:00
# endif
2017-05-28 15:42:32 +00:00
cl . playerview [ seat ] . sb_showscores = true ;
2004-08-23 00:15:46 +00:00
sb_updates = 0 ;
}
2016-07-12 00:40:13 +00:00
# ifdef HEXEN2
static void Sbar_Hexen2InvLeft_f ( void )
2008-06-01 22:06:22 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
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 ;
2017-11-16 22:20:40 +00:00
playerview_t * pv = & cl . playerview [ seat ] ;
2013-06-23 02:17:02 +00:00
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
}
2016-07-12 00:40:13 +00:00
static void Sbar_Hexen2InvRight_f ( void )
2008-06-01 22:06:22 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
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 ;
2017-11-16 22:20:40 +00:00
playerview_t * pv = & cl . playerview [ seat ] ;
2013-06-23 02:17:02 +00:00
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
}
2016-07-12 00:40:13 +00:00
static void Sbar_Hexen2InvUse_f ( void )
2008-06-01 22:06:22 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
2011-04-23 20:37:20 +00:00
if ( cls . protocol = = CP_QUAKE2 )
{
CL_SendClientCommand ( true , " invuse " ) ;
}
else
{
2017-11-16 22:20:40 +00:00
playerview_t * pv = & cl . playerview [ seat ] ;
2013-06-23 02:17:02 +00:00
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
}
2016-07-12 00:40:13 +00:00
static void Sbar_Hexen2ShowInfo_f ( void )
2008-06-01 22:06:22 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
playerview_t * pv = & cl . playerview [ seat ] ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
2013-06-23 02:17:02 +00:00
pv - > sb_hexen2_extra_info = true ;
2008-06-01 22:06:22 +00:00
}
2016-07-12 00:40:13 +00:00
static void Sbar_Hexen2DontShowInfo_f ( void )
2008-06-01 22:06:22 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
playerview_t * pv = & cl . playerview [ seat ] ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
2013-06-23 02:17:02 +00:00
pv - > sb_hexen2_extra_info = false ;
2008-06-01 22:06:22 +00:00
}
2016-07-12 00:40:13 +00:00
static void Sbar_Hexen2PInfoPlaque_f ( void )
2010-08-16 02:03:02 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
playerview_t * pv = & cl . playerview [ seat ] ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
2013-06-23 02:17:02 +00:00
pv - > sb_hexen2_infoplaque = true ;
2010-08-16 02:03:02 +00:00
}
2016-07-12 00:40:13 +00:00
static void Sbar_Hexen2MInfoPlaque_f ( void )
2010-08-16 02:03:02 +00:00
{
2017-11-16 22:20:40 +00:00
int seat = CL_TargettedSplit ( false ) ;
playerview_t * pv = & cl . playerview [ seat ] ;
2015-12-28 17:41:39 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2015-12-28 17:41:39 +00:00
return ;
# endif
2013-06-23 02:17:02 +00:00
pv - > sb_hexen2_infoplaque = false ;
2010-08-16 02:03:02 +00:00
}
2016-07-12 00:40:13 +00:00
# endif
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 )
{
2017-05-28 15:42:32 +00:00
int seat = CL_TargettedSplit ( false ) ;
2009-11-04 21:16:50 +00:00
if ( scr_scoreboard_teamscores . ival )
2007-10-02 16:00:38 +00:00
{
Sbar_DontShowTeamScores ( ) ;
return ;
}
2017-05-28 15:42:32 +00:00
cl . playerview [ seat ] . sb_showscores = false ;
2004-08-23 00:15:46 +00:00
sb_updates = 0 ;
2005-10-16 03:57:01 +00:00
# ifdef CSQC_DAT
2017-11-16 22:20:40 +00:00
if ( CSQC_ConsoleCommand ( seat , Cmd_Argv ( 0 ) ) )
2005-10-16 03:57:01 +00:00
return ;
# endif
2004-08-23 00:15:46 +00:00
}
/*
= = = = = = = = = = = = = = =
Sbar_Changed
= = = = = = = = = = = = = = =
*/
void Sbar_Changed ( void )
{
sb_updates = 0 ; // update next frame
}
/*
= = = = = = = = = = = = = = =
Sbar_Init
= = = = = = = = = = = = = = =
*/
2014-01-15 02:51:01 +00:00
static qboolean sbar_loaded ;
2004-08-23 00:15:46 +00:00
2015-08-04 15:16:24 +00:00
static apic_t * Sbar_PicFromWad ( char * name )
2004-08-23 00:15:46 +00:00
{
2015-08-04 15:16:24 +00:00
apic_t * ret ;
2014-01-15 02:51:01 +00:00
char savedname [ MAX_QPATH ] ;
Q_strncpyz ( savedname , name , sizeof ( savedname ) ) ;
2015-08-04 15:16:24 +00:00
ret = R2D_LoadAtlasedPic ( savedname ) ;
2004-08-23 00:15:46 +00:00
if ( ret )
return ret ;
return NULL ;
}
void Sbar_Flush ( void )
{
sbar_loaded = false ;
2020-02-11 18:06:10 +00:00
memset ( sb_weapons , 0 , sizeof ( sb_weapons ) ) ;
2004-08-23 00:15:46 +00:00
}
void Sbar_Start ( void ) //if one of these fails, skip the entire status bar.
{
int i ;
2016-08-25 00:12:14 +00:00
size_t lumpsize ;
2017-12-09 21:22:46 +00:00
qbyte lumptype ;
2004-08-23 00:15:46 +00:00
if ( sbar_loaded )
return ;
2020-02-11 18:06:10 +00:00
memset ( sb_weapons , 0 , sizeof ( sb_weapons ) ) ;
2004-08-23 00:15:46 +00:00
sbar_loaded = true ;
2014-10-05 20:04:11 +00:00
COM_FlushFSCache ( false , true ) ; //make sure the fs cache is built if needed. there's lots of loading here.
2004-08-23 00:15:46 +00:00
if ( ! wad_base ) //the wad isn't loaded. This is an indication that it doesn't exist.
{
sbarfailed = true ;
return ;
}
2014-04-24 01:53:01 +00:00
2004-08-23 00:15:46 +00:00
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 ) ) ;
}
2014-09-17 03:04:08 +00:00
# ifdef HEXEN2
2014-10-11 19:39:45 +00:00
sbar_hexen2 = false ;
2017-12-09 21:22:46 +00:00
if ( W_GetLumpName ( " tinyfont " , & lumpsize , & lumptype ) )
2008-06-01 22:06:22 +00:00
sbar_hexen2 = true ;
2014-10-05 20:04:11 +00:00
// if (sb_nums[0][0] && sb_nums[0][0]->width < 13)
// sbar_hexen2 = true;
2014-09-17 03:04:08 +00:00
# endif
2008-06-01 22:06:22 +00:00
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_ibar = Sbar_PicFromWad ( " ibar " ) ;
2014-10-05 20:04:11 +00:00
sb_sbar = Sbar_PicFromWad ( " sbar " ) ;
2004-08-23 00:15:46 +00:00
sb_scorebar = Sbar_PicFromWad ( " scorebar " ) ;
//try to detect rogue wads, and thus the stats we will be getting from the server.
2017-12-09 21:22:46 +00:00
sbar_rogue = COM_CheckParm ( " -rogue " ) | | ! ! W_GetLumpName ( " r_lava " , & lumpsize , & lumptype ) ;
2014-10-05 20:04:11 +00:00
if ( sbar_rogue )
{
rsb_invbar [ 0 ] = Sbar_PicFromWad ( " r_invbar1 " ) ;
rsb_invbar [ 1 ] = Sbar_PicFromWad ( " r_invbar2 " ) ;
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
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 " ) ;
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
rsb_items [ 0 ] = Sbar_PicFromWad ( " r_shield1 " ) ;
rsb_items [ 1 ] = Sbar_PicFromWad ( " r_agrav1 " ) ;
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
rsb_teambord = Sbar_PicFromWad ( " r_teambord " ) ;
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
rsb_ammo [ 0 ] = Sbar_PicFromWad ( " r_ammolava " ) ;
rsb_ammo [ 1 ] = Sbar_PicFromWad ( " r_ammomulti " ) ;
rsb_ammo [ 2 ] = Sbar_PicFromWad ( " r_ammoplasma " ) ;
}
2004-08-23 00:15:46 +00:00
2017-12-09 21:22:46 +00:00
sbar_hipnotic = COM_CheckParm ( " -hipnotic " ) | | ! ! W_GetLumpName ( " inv_mjolnir " , & lumpsize , & lumptype ) ;
2014-10-05 20:04:11 +00:00
if ( sbar_hipnotic )
2014-09-03 16:06:23 +00:00
{
2014-10-05 20:04:11 +00:00
hsb_weapons [ 0 ] [ 0 ] = Sbar_PicFromWad ( " inv_laser " ) ;
hsb_weapons [ 0 ] [ 1 ] = Sbar_PicFromWad ( " inv_mjolnir " ) ;
hsb_weapons [ 0 ] [ 2 ] = Sbar_PicFromWad ( " inv_gren_prox " ) ;
hsb_weapons [ 0 ] [ 3 ] = Sbar_PicFromWad ( " inv_prox_gren " ) ;
hsb_weapons [ 0 ] [ 4 ] = Sbar_PicFromWad ( " inv_prox " ) ;
hsb_weapons [ 1 ] [ 0 ] = Sbar_PicFromWad ( " inv2_laser " ) ;
hsb_weapons [ 1 ] [ 1 ] = Sbar_PicFromWad ( " inv2_mjolnir " ) ;
hsb_weapons [ 1 ] [ 2 ] = Sbar_PicFromWad ( " inv2_gren_prox " ) ;
hsb_weapons [ 1 ] [ 3 ] = Sbar_PicFromWad ( " inv2_prox_gren " ) ;
hsb_weapons [ 1 ] [ 4 ] = Sbar_PicFromWad ( " inv2_prox " ) ;
for ( i = 0 ; i < 5 ; i + + )
{
hsb_weapons [ 2 + i ] [ 0 ] = Sbar_PicFromWad ( va ( " inva%i_laser " , i + 1 ) ) ;
hsb_weapons [ 2 + i ] [ 1 ] = Sbar_PicFromWad ( va ( " inva%i_mjolnir " , i + 1 ) ) ;
hsb_weapons [ 2 + i ] [ 2 ] = Sbar_PicFromWad ( va ( " inva%i_gren_prox " , i + 1 ) ) ;
hsb_weapons [ 2 + i ] [ 3 ] = Sbar_PicFromWad ( va ( " inva%i_prox_gren " , i + 1 ) ) ;
hsb_weapons [ 2 + i ] [ 4 ] = Sbar_PicFromWad ( va ( " inva%i_prox " , i + 1 ) ) ;
}
hsb_items [ 0 ] = Sbar_PicFromWad ( " sb_wsuit " ) ;
hsb_items [ 1 ] = Sbar_PicFromWad ( " sb_eshld " ) ;
2014-09-03 16:06:23 +00:00
}
2004-08-23 00:15:46 +00:00
}
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 " ) ;
2015-06-16 23:53:58 +00:00
Cvar_Register ( & scr_scoreboard_showflags , " Scoreboard settings " ) ;
2021-04-14 05:21:04 +00:00
Cvar_Register ( & scr_scoreboard_showruleset , " Scoreboard settings " ) ;
2015-06-16 23:53:58 +00:00
Cvar_Register ( & scr_scoreboard_fillalpha , " Scoreboard settings " ) ;
2020-02-11 18:06:10 +00:00
Cvar_Register ( & scr_scoreboard_backgroundalpha , " Scoreboard settings " ) ;
2007-10-02 16:00:38 +00:00
Cvar_Register ( & scr_scoreboard_teamscores , " Scoreboard settings " ) ;
2015-06-16 23:53:58 +00:00
Cvar_Register ( & scr_scoreboard_teamsort , " 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 " ) ;
2017-07-04 05:07:51 +00:00
Cvar_Register ( & cl_sbaralpha , " Status bar settings " ) ;
2008-11-09 22:29:28 +00:00
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
2016-07-12 00:40:13 +00:00
# ifdef HEXEN2
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 ) ;
2016-07-12 00:40:13 +00:00
Cmd_AddCommandD ( " +showinfo " , Sbar_Hexen2ShowInfo_f , " Hexen2 Compat " ) ;
Cmd_AddCommandD ( " -showinfo " , Sbar_Hexen2DontShowInfo_f , " Hexen2 Compat " ) ;
Cmd_AddCommandD ( " +infoplaque " , Sbar_Hexen2PInfoPlaque_f , " Hexen2 Compat " ) ;
Cmd_AddCommandD ( " -infoplaque " , Sbar_Hexen2MInfoPlaque_f , " Hexen2 Compat " ) ;
Cmd_AddCommandD ( " +showdm " , Sbar_ShowScores , " Hexen2 Compat " ) ;
Cmd_AddCommandD ( " -showdm " , Sbar_DontShowScores , " Hexen2 Compat " ) ;
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 ) ;
2016-07-12 00:40:13 +00:00
# endif
2004-08-23 00:15:46 +00:00
}
//=============================================================================
// drawing routines are reletive to the status bar location
/*
= = = = = = = = = = = = =
Sbar_DrawPic
= = = = = = = = = = = = =
*/
2015-08-04 15:16:24 +00:00
static void Sbar_DrawPic ( float x , float y , float w , float h , apic_t * pic )
{
R2D_ImageAtlas ( sbar_rect . x + x /* + ((sbar_rect.width - 320)>>1) */ , sbar_rect . y + y + ( sbar_rect . height - SBAR_HEIGHT ) , w , h , 0 , 0 , 1 , 1 , pic ) ;
}
static void Sbar_DrawMPic ( float x , float y , float w , float 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 .
*/
2015-08-04 15:16:24 +00:00
static void Sbar_DrawSubPic ( float x , float y , float width , float height , apic_t * pic , int srcx , int srcy , int srcwidth , int srcheight )
2004-08-23 00:15:46 +00:00
{
2015-08-04 15:16:24 +00:00
float newsl , newtl , newsh , newth ;
newsl = ( srcx ) / ( float ) srcwidth ;
newsh = newsl + ( width ) / ( float ) srcwidth ;
newtl = ( srcy ) / ( float ) srcheight ;
newth = newtl + ( height ) / ( float ) srcheight ;
R2D_ImageAtlas ( sbar_rect . x + x , sbar_rect . y + y + ( sbar_rect . height - SBAR_HEIGHT ) , width , height , newsl , newtl , newsh , newth , pic ) ;
2004-08-23 00:15:46 +00:00
}
/*
= = = = = = = = = = = = = = = =
Sbar_DrawCharacter
Draws one solid graphics character
= = = = = = = = = = = = = = = =
*/
2013-08-27 13:18:09 +00:00
void Sbar_DrawCharacter ( float x , float y , int num )
2004-08-23 00:15:46 +00:00
{
2013-08-27 13:18:09 +00:00
int px , py ;
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , sbar_rect . x + x + 4 , sbar_rect . y + y + sbar_rect . height - SBAR_HEIGHT , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , num | 0xe000 ) ;
2013-12-29 22:48:28 +00:00
Font_EndString ( font_default ) ;
2004-08-23 00:15:46 +00:00
}
/*
= = = = = = = = = = = = = = = =
Sbar_DrawString
= = = = = = = = = = = = = = = =
*/
2013-08-27 13:18:09 +00:00
void Sbar_DrawString ( float x , float 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 ) ;
}
2013-08-27 13:18:09 +00:00
void Sbar_DrawExpandedString ( float x , float y , conchar_t * str )
2010-08-28 17:14:38 +00:00
{
2019-01-13 16:51:50 +00:00
Draw_ExpandedString ( font_default , 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
}
2013-08-27 13:18:09 +00:00
void Draw_TinyString ( float x , float y , const qbyte * str )
2008-06-01 22:06:22 +00:00
{
2009-11-04 21:16:50 +00:00
float xstart ;
2013-08-27 13:18:09 +00:00
int px , py ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
unsigned int codepoint ;
int error ;
2009-11-04 21:16:50 +00:00
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
{
Too many changes, sorry.
Change revision displays, use the SVN commit date instead of using __DATE__ (when there's no local changes). This should allow reproducible builds.
Added s_al_disable cvar, to block openal and all the various problems people have had with it, without having to name an explicit fallback (which would vary by system).
Add mastervolume cvar (for ss).
Add r_shadows 2 (aka fake shadows - for ss).
Add scr_loadingscreen_aspect -1 setting, to disable levelshots entirely, also disables the progress bar (for ss).
Better support for some effectinfo hacks (for ss).
Added dpcompat_nocsqcwarnings (because of lazy+buggy mods like ss).
Rework the dpcsqc versions of project+unproject builtins for better compat (for ss).
Added dpcompat_csqcinputeventtypes to block unexpected csqc input events (for ss).
Better compat with DP's loadfont console command (for ss).
Added dpcompat_smallerfonts cvar to replicate a DP bug (for ss).
Detect dp's m_draw extension, to work around it (for ss).
Cvar dpcompat_ignoremodificationtimes added. A value of 0 favour the most recently modified file, 1 will use DP-like alphabetically sorted preferences (for ss).
loadfont builtin can now accept outline=1 in the sizes arg for slightly more readable fonts.
Fix bbox calcs for rotated entities, fix needed for r_ignorenetpvs 0.
Hackily parse emoji.json to provide :poop: etc suggestions.
Skip prediction entirely when there's no local entity info. This fixes stair-smoothing in xonotic.
screenshot_cubemap will now capture half-float images when saving to ktx or dds files.
Fix support for xcf files larger than 4gb, mostly to avoid compiler warnings.
Fixed size of gfx/loading.lmp when replacement textures are used.
Added mipmap support for rg8 and l8a8 textures.
r_hdr_framebuffer cvar updated to support format names instead of random negative numbers. Description updated to name some interesting ones.
Perform autoupdate _checks_ ONLY with explicit user confirmation (actual updating already needed user confirmation, but this extra step should reduce the chances of us getting wrongly accused of exfiltrating user data if we're run in a sandbox - we ONLY ever included the updating engine's version in the checks, though there's nothing we can do to avoid sending the user's router's IP).
Removed the 'summon satan all over your harddrive' quit message, in case paranoid security researchers are idiots and don't bother doing actual research.
Removed the triptohell.info and fte.triptohell.info certificates, they really need to stop being self-signed. The updates domain is still self-signed for autoupdates.
Video drivers are now able to report supported video resolutions, visible to menuqc. Currently only works with SDL2 builds.
Added setmousepos builtin. Should work with glx+win32 build.
VF_SKYROOM_CAMERA can now accept an extra two args, setviewprop(VF_SKYROOM_CAMERA, org, axis, degrees).
Removed v_skyroom_origin+v_skyroom_orientation cvars in favour just v_skyroom, which should make it behave more like the 'fog' command (used when csqc isn't overriding).
Added R_EndPolygonRibbon builtin to make it faster+easier to generate textured ribbon/cable/etc wide lines (for TW).
sdl: Fix up sys_sdl.c's file enumeration to support wildcards in directories.
edit command now displays end1.bin/end2.bin correctly, because we can.
Finally add support for f_modified - though ruleset_allow_larger_models and ruleset_allow_overlong_sounds generally make it redundant.
Fix threading race condition in sha1 lookups.
Updated f_ruleset to include the same extra flags reported by ezquake.
A mod's default.fmf file can now contain an eg 'mainconfig config.cfg' line (to explicitly set the main config saved with cfg_save_auto 1 etc).
fmf: basegame steam:GameName/GameDir can be used to try to load a mod directory from an installed steam game. The resulting gamedir will be read-only.
HOMEDIR CHANGE: use homedirs only if the basedir cannot be written or a homedir already exists, which should further reduce the probability of microsoft randomly uploading our data to their cloud (but mostly because its annoying to never know where your data is written).
Fixed buf_cvarlist, should work in xonotic now, and without segfaults.
Added an extra arg to URI_Get_Callback calls - the response size, also changed the tempstring to contain all bytes of the response, you need to be careful about nulls though.
Try to work around nvidia's forced-panning bug on x11 when changing video modes. This might screw with other programs.
sdl: support custom icons.
sdl: support choosing a specific display.
Added some documentation to menuqc builtins.
menusys: use outlines for slightly more readable fonts.
menusys: switch vid_width and vid_height combos into a single video mode combo to set both according to reported video modes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5581 fc73d0e0-1445-4013-8a0c-d673dee63da5
2019-11-20 03:09:50 +00:00
font_tiny = Font_LoadFont ( " gfx/tinyfont " , 8 , 1 , 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
if ( ! font_tiny )
return ;
}
2009-11-04 21:16:50 +00:00
2013-08-27 13:18:09 +00:00
Font_BeginString ( font_tiny , x , y , & px , & py ) ;
xstart = px ;
2009-11-04 21:16:50 +00:00
2008-06-01 22:06:22 +00:00
while ( * str )
{
2018-11-27 16:48:19 +00:00
codepoint = unicode_decode ( & error , str , ( char const * * ) & str , true ) ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
if ( codepoint = = ' \n ' )
2008-06-01 22:06:22 +00:00
{
2013-08-27 13:18:09 +00:00
px = xstart ;
py + = Font_CharHeight ( ) ;
2008-06-01 22:06:22 +00:00
str + + ;
continue ;
}
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
px = Font_DrawChar ( px , py , CON_WHITEMASK , codepoint ) ;
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
}
2013-08-27 13:18:09 +00:00
void Sbar_DrawTinyString ( float x , float y , char * str )
2008-06-01 22:06:22 +00:00
{
Draw_TinyString ( sbar_rect . x + x /*+ ((sbar_rect.width - 320)>>1) */ , sbar_rect . y + y + sbar_rect . height - SBAR_HEIGHT , str ) ;
}
2014-10-05 20:04:11 +00:00
void Sbar_DrawTinyStringf ( float x , float y , char * fmt , . . . )
{
va_list argptr ;
char string [ 256 ] ;
va_start ( argptr , fmt ) ;
vsnprintf ( string , sizeof ( string ) - 1 , fmt , argptr ) ;
va_end ( argptr ) ;
Draw_TinyString ( sbar_rect . x + x /*+ ((sbar_rect.width - 320)>>1) */ , sbar_rect . y + y + sbar_rect . height - SBAR_HEIGHT , string ) ;
}
2008-06-01 22:06:22 +00:00
2013-08-27 13:18:09 +00:00
void Sbar_FillPC ( float x , float y , float w , float h , unsigned int pcolour )
2008-06-01 22:06:22 +00:00
{
if ( pcolour > = 16 )
{
2018-03-25 09:36:14 +00:00
R2D_ImageColours ( SRGBA ( ( ( pcolour & 0xff0000 ) > > 16 ) / 255.0f , ( ( pcolour & 0xff00 ) > > 8 ) / 255.0f , ( pcolour & 0xff ) / 255.0f , 1.0 ) ) ;
2011-03-31 01:14:01 +00:00
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
}
}
2015-06-16 23:53:58 +00:00
static void Sbar_FillPCDark ( float x , float y , float w , float h , unsigned int pcolour , float alpha )
2008-06-01 22:06:22 +00:00
{
if ( pcolour > = 16 )
{
2018-03-25 09:36:14 +00:00
R2D_ImageColours ( SRGBA ( ( ( pcolour & 0xff0000 ) > > 16 ) / 1024.0f , ( ( pcolour & 0xff00 ) > > 8 ) / 1024.0f , ( pcolour & 0xff ) / 1024.0f , alpha ) ) ;
2011-03-31 01:14:01 +00:00
R2D_FillBlock ( x , y , w , h ) ;
2008-06-01 22:06:22 +00:00
}
else
{
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( Sbar_ColorForMap ( pcolour ) - 1 , alpha ) ;
2011-03-31 01:14:01 +00:00
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
2015-04-14 23:12:17 +00:00
for ( pow10 = 10 ; num > = pow10 & & pow10 > = 10 ; pow10 * = 10 )
2004-08-23 00:15:46 +00:00
;
2005-11-26 03:02:55 +00:00
2015-04-14 23:12:17 +00:00
if ( pow10 > 0 )
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
= = = = = = = = = = = = =
*/
2013-08-27 13:18:09 +00:00
void Sbar_DrawNum ( float x , float y , int num , int digits , int color )
2004-08-23 00:15:46 +00:00
{
2015-04-14 23:12:17 +00:00
char str [ 16 ] ;
2004-08-23 00:15:46 +00:00
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 + + ;
}
}
2016-07-12 00:40:13 +00:00
# ifdef HEXEN2
static void Sbar_Hexen2DrawNum ( float x , float y , int num , int digits )
2008-06-01 22:06:22 +00:00
{
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 + + ;
}
}
2016-07-12 00:40:13 +00:00
# endif
2008-06-01 22:06:22 +00:00
2004-08-23 00:15:46 +00:00
//=============================================================================
2010-11-21 03:39:12 +00:00
int playerteam [ MAX_CLIENTS ] ;
2004-08-23 00:15:46 +00:00
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 ) ) ;
}
2015-09-01 04:45:15 +00:00
# endif
unsigned int Sbar_ColorForMap ( unsigned int m )
{
if ( m > = 16 )
return m ;
2016-07-12 00:40:13 +00:00
m = ( m > 13 ) ? 13 : m ;
2015-09-01 04:45:15 +00:00
m * = 16 ;
return m < 128 ? m + 8 : m + 8 ;
}
int scoreboardlines ;
int fragsort [ MAX_CLIENTS ] ;
2004-08-23 00:15:46 +00:00
/*
= = = = = = = = = = = = = = =
Sbar_SortFrags
= = = = = = = = = = = = = = =
*/
2015-06-16 23:53:58 +00:00
void Sbar_SortFrags ( qboolean includespec , qboolean doteamsort )
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 )
2015-06-16 23:53:58 +00:00
doteamsort = false ;
2010-11-21 03:39:12 +00:00
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 + + ;
}
}
2005-11-26 03:02:55 +00:00
2004-08-23 00:15:46 +00:00
for ( i = 0 ; i < scoreboardlines ; i + + )
2015-06-16 23:53:58 +00:00
for ( j = i + 1 ; j < scoreboardlines ; j + + )
2010-11-21 03:39:12 +00:00
{
2015-09-01 04:45:15 +00:00
int w1 , w2 ;
# ifdef QUAKEHUD
2015-06-16 23:53:58 +00:00
int t1 = playerteam [ fragsort [ i ] ] ;
int t2 = playerteam [ fragsort [ j ] ] ;
//teams are already sorted by frags
w1 = t1 < 0 ? - 999 : - teamsort [ t1 ] ;
w2 = t2 < 0 ? - 999 : - teamsort [ t2 ] ;
//okay, they're on the same team then? go ahead and sort by personal frags
if ( ! doteamsort | | w1 = = w2 )
2015-09-01 04:45:15 +00:00
# endif
2004-08-23 00:15:46 +00:00
{
2015-10-27 15:20:15 +00:00
w1 = cl . players [ fragsort [ i ] ] . spectator = = 1 ? - 999 : cl . players [ fragsort [ i ] ] . frags ;
w2 = cl . players [ fragsort [ j ] ] . spectator = = 1 ? - 999 : cl . players [ fragsort [ j ] ] . frags ;
2004-08-23 00:15:46 +00:00
}
2015-06-16 23:53:58 +00:00
if ( w1 < w2 )
2010-11-21 03:39:12 +00:00
{
2015-06-16 23:53:58 +00:00
k = fragsort [ i ] ;
fragsort [ i ] = fragsort [ j ] ;
fragsort [ j ] = k ;
2010-11-21 03:39:12 +00:00
}
}
2004-08-23 00:15:46 +00:00
}
2015-09-01 04:45:15 +00:00
# ifdef QUAKEHUD
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
2013-10-29 17:38:22 +00:00
for ( i = 0 ; i < cl . allocated_client_slots ; i + + )
2004-08-23 00:15:46 +00:00
teams [ i ] . plow = 999 ;
2013-06-23 02:17:02 +00:00
ownnum = Sbar_PlayerNum ( pv ) ;
2007-07-23 18:52:11 +00:00
2013-10-29 17:38:22 +00:00
for ( i = 0 ; i < cl . allocated_client_slots ; i + + )
2007-07-23 18:52:11 +00:00
{
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 ;
}
}
/*
= = = = = = = = = = = = = = =
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 ;
2015-08-20 03:17:47 +00:00
qboolean hudswap ;
2014-09-03 16:06:23 +00:00
float wleft , wtop ;
2015-08-20 03:17:47 +00:00
apic_t * ibar ;
2004-08-23 00:15:46 +00:00
2017-07-04 05:07:51 +00:00
headsup = ! ( cl_sbar . value | | ( scr_viewsize . value < 100 ) ) ;
2004-08-23 00:15:46 +00:00
hudswap = cl_hudswap . value ; // Get that nasty float out :)
2014-09-03 16:06:23 +00:00
//coord for the left of the weapons, with hud
wleft = hudswap ? sbar_rect_left : ( sbar_rect . width - 24 ) ;
wtop = - 180 ; //68-(7-0)*16;
if ( sbar_hipnotic )
wtop - = 16 * 2 ;
2015-08-20 03:17:47 +00:00
if ( sbar_rogue )
2004-08-23 00:15:46 +00:00
{
2015-08-20 03:17:47 +00:00
if ( pv - > stats [ STAT_ACTIVEWEAPON ] > = RIT_LAVA_NAILGUN )
ibar = rsb_invbar [ 0 ] ;
2004-08-23 00:15:46 +00:00
else
2015-08-20 03:17:47 +00:00
ibar = rsb_invbar [ 1 ] ;
2004-08-23 00:15:46 +00:00
}
2015-08-20 03:17:47 +00:00
else
ibar = sb_ibar ;
if ( ! headsup )
2017-07-04 05:07:51 +00:00
{
if ( cl_sbar . ival ! = 1 & & scr_viewsize . value > = 100 )
R2D_ImageColours ( cl_sbaralpha . value , cl_sbaralpha . value , cl_sbaralpha . value , cl_sbaralpha . value ) ;
2015-08-20 03:17:47 +00:00
Sbar_DrawPic ( 0 , - 24 , 320 , 24 , ibar ) ;
2017-07-04 05:07:51 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
}
2015-08-20 03:17:47 +00:00
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 )
2014-09-03 16:06:23 +00:00
Sbar_DrawSubPic ( wleft , wtop + i * 16 , 24 , 16 , sb_weapons [ flashon ] [ i ] , 0 , 0 , ( i = = 6 ) ? ( sbar_hipnotic ? 32 : 48 ) : 24 , 16 ) ;
2009-11-04 21:16:50 +00:00
}
else
{
2014-09-03 16:06:23 +00:00
Sbar_DrawPic ( i * 24 , - 16 , ( i = = 6 ) ? ( sbar_hipnotic ? 32 : 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
}
}
2014-09-03 16:06:23 +00:00
if ( sbar_hipnotic )
{
int grenadeflashing = 0 ;
for ( i = 0 ; i < 4 ; i + + )
{
if ( pv - > stats [ STAT_ITEMS ] & ( 1 < < hipweapons [ i ] ) )
{
time = pv - > item_gettime [ hipweapons [ i ] ] ;
flashon = ( int ) ( ( cl . time - time ) * 10 ) ;
if ( flashon > = 10 )
{
if ( pv - > stats [ STAT_ACTIVEWEAPON ] = = ( 1 < < hipweapons [ i ] ) )
flashon = 1 ;
else
flashon = 0 ;
}
else
flashon = ( flashon % 5 ) + 2 ;
// check grenade launcher
if ( i = = 2 )
{
if ( pv - > stats [ STAT_ITEMS ] & HIT_PROXIMITY_GUN )
{
if ( flashon )
{
grenadeflashing = 1 ;
Sbar_DrawPic ( headsup ? wleft : 96 , headsup ? wtop + 4 * 16 : - 16 , 24 , 16 , hsb_weapons [ flashon ] [ 2 ] ) ;
}
}
}
else if ( i = = 3 )
{
if ( pv - > stats [ STAT_ITEMS ] & ( IT_SHOTGUN < < 4 ) )
{
if ( flashon & & ! grenadeflashing )
Sbar_DrawPic ( headsup ? wleft : 96 , headsup ? wtop + 4 * 16 : - 16 , 24 , 16 , hsb_weapons [ flashon ] [ 3 ] ) ;
else if ( ! grenadeflashing )
Sbar_DrawPic ( headsup ? wleft : 96 , headsup ? wtop + 4 * 16 : - 16 , 24 , 16 , hsb_weapons [ 0 ] [ 3 ] ) ;
}
else
Sbar_DrawPic ( headsup ? wleft : 96 , headsup ? wtop + 4 * 16 : - 16 , 24 , 16 , hsb_weapons [ flashon ] [ 4 ] ) ;
}
// else if (i == 1)
// Sbar_DrawPic (176 + (i*24), -16, 24, 16, hsb_weapons[flashon][i]);
else
{
if ( headsup )
Sbar_DrawPic ( headsup ? wleft : ( 176 + ( i * 24 ) ) , headsup ? wtop + ( i + 7 ) * 16 : - 16 , 24 , 16 , hsb_weapons [ flashon ] [ i ] ) ;
else
Sbar_DrawPic ( headsup ? wleft : ( 176 + ( i * 24 ) ) , headsup ? wtop + ( i + 7 ) * 16 : - 16 , 24 , 16 , hsb_weapons [ flashon ] [ i ] ) ;
}
if ( flashon > 1 )
sb_updates = 0 ; // force update to remove flash
}
}
}
2004-08-23 00:15:46 +00:00
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
}
}
}
}
flashon = 0 ;
// items
2014-09-03 16:06:23 +00:00
for ( i = ( sbar_hipnotic ? 2 : 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
2014-09-03 16:06:23 +00:00
if ( sbar_hipnotic )
{
for ( i = 0 ; i < 2 ; i + + )
{
if ( pv - > stats [ STAT_ITEMS ] & ( 1 < < ( 24 + i ) ) )
{
time = pv - > item_gettime [ 24 + i ] ;
if ( time & & time > cl . time - 2 & & flashon ) // flash frame
sb_updates = 0 ;
else
Sbar_DrawPic ( 288 + i * 16 , - 16 , 16 , 16 , hsb_items [ i ] ) ;
if ( time & & time > cl . time - 2 )
sb_updates = 0 ;
}
}
}
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 ] ;
2014-09-03 16:06:23 +00:00
if ( time & & time > cl . time - 2 & & flashon ) // flash frame
2004-08-23 00:15:46 +00:00
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
}
2015-08-04 15:16:24 +00:00
// ammo counts
if ( headsup )
{
for ( i = 0 ; i < 4 ; i + + )
2015-08-20 03:17:47 +00:00
Sbar_DrawSubPic ( ( hudswap ) ? sbar_rect_left : ( sbar_rect . width - 42 ) , - 24 - ( 4 - i ) * 11 , 42 , 11 , ibar , 3 + ( i * 48 ) , 0 , 320 , 24 ) ;
2015-08-04 15:16:24 +00:00
}
for ( i = 0 ; i < 4 ; i + + )
{
2015-08-20 03:17:47 +00:00
snprintf ( num , sizeof ( num ) , " %4i " , pv - > stats [ STAT_SHELLS + i ] ) ;
2015-08-04 15:16:24 +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 ' ) : ' ' ) ;
2015-08-20 03:17:47 +00:00
numc [ 3 ] = CON_WHITEMASK | 0xe000 | ( ( num [ 3 ] ! = ' ' ) ? ( num [ 3 ] + 18 - ' 0 ' ) : ' ' ) ;
numc [ 4 ] = 0 ;
2015-08-04 15:16:24 +00:00
if ( headsup )
{
2015-08-20 03:17:47 +00:00
Sbar_DrawExpandedString ( ( ( hudswap ) ? sbar_rect_left + 3 : ( sbar_rect . width - 39 ) ) - 4 , - 24 - ( 4 - i ) * 11 , numc ) ;
2015-08-04 15:16:24 +00:00
}
else
{
2015-08-20 03:17:47 +00:00
Sbar_DrawExpandedString ( ( 6 * i + 1 ) * 8 - 2 - 4 , - 24 , numc ) ;
2015-08-04 15:16:24 +00:00
}
}
2004-08-23 00:15:46 +00:00
}
2013-12-02 14:30:30 +00:00
static qboolean PointInBox ( float px , float py , float x , float y , float w , float h )
{
if ( px > = x & & px < x + w )
if ( py > = y & & py < y + h )
return true ;
return false ;
}
int Sbar_TranslateHudClick ( void )
{
int i ;
float vx = mousecursor_x - sbar_rect . x ;
float vy = mousecursor_y - ( sbar_rect . y + ( sbar_rect . height - SBAR_HEIGHT ) ) ;
2017-07-04 05:07:51 +00:00
qboolean headsup = ! ( cl_sbar . value | | ( scr_viewsize . value < 100 ) ) ;
2013-12-02 14:30:30 +00:00
qboolean hudswap = cl_hudswap . value ; // Get that nasty float out :)
//inventory. clicks do specific-weapon impulses.
if ( sb_lines > 24 )
{
for ( i = 0 ; i < 7 ; i + + )
{
if ( headsup )
{
if ( i | | sbar_rect . height > 200 )
if ( PointInBox ( vx , vy , ( hudswap ) ? 0 : ( sbar_rect . width - 24 ) , - 68 - ( 7 - i ) * 16 , 24 , 16 ) )
return ' 2 ' + i ;
}
else
{
if ( PointInBox ( vx , vy , i * 24 , - 16 , ( i = = 6 ) ? 48 : 24 , 16 ) )
return ' 2 ' + i ;
}
}
}
//armour. trigger backtick, to toggle the console (which enables the on-screen keyboard on android).
if ( PointInBox ( vx , vy , 0 , 0 , 96 , 24 ) )
return ' ` ' ;
//face. do showscores.
if ( PointInBox ( vx , vy , 112 , 0 , 96 , 24 ) )
return K_TAB ;
//currentammo+icon. trigger '/' binding, which defaults to weapon-switch (impulse 10)
if ( PointInBox ( vx , vy , 224 , 0 , 96 , 24 ) )
return ' / ' ;
return 0 ;
}
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 ;
2013-08-27 13:18:09 +00:00
float x , y ;
int 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
2015-11-18 07:37:39 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
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
{
2017-07-04 05:07:51 +00:00
if ( cl_sbar . value | | ( scr_viewsize . value < 100 ) )
{
if ( cl_sbar . ival ! = 1 & & scr_viewsize . value > = 100 )
R2D_ImageColours ( cl_sbaralpha . value , cl_sbaralpha . value , cl_sbaralpha . value , cl_sbaralpha . value ) ;
2009-11-04 21:16:50 +00:00
Sbar_DrawPic ( 0 , 0 , 320 , 24 , sb_sbar ) ;
2017-07-04 05:07:51 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
}
2004-08-23 00:15:46 +00:00
2014-09-03 16:06:23 +00:00
//hipnotic's keys appear to the right of health.
if ( sbar_hipnotic )
{
if ( pv - > stats [ STAT_ITEMS ] & IT_KEY1 )
Sbar_DrawPic ( 209 , 3 , 16 , 9 , sb_items [ 0 ] ) ;
if ( pv - > stats [ STAT_ITEMS ] & IT_KEY2 )
Sbar_DrawPic ( 209 , 12 , 16 , 9 , sb_items [ 1 ] ) ;
}
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 ) ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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
}
2017-05-28 15:42:32 +00:00
qboolean Sbar_ShouldDraw ( playerview_t * pv )
2004-08-23 00:15:46 +00:00
{
2015-09-01 04:45:15 +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
2017-07-04 05:07:51 +00:00
headsup = ! ( cl_sbar . value | | ( scr_viewsize . value < 100 ) ) ;
2007-02-26 03:00:25 +00:00
if ( ( sb_updates > = vid . numpages ) & & ! headsup )
return false ;
return true ;
}
2017-05-28 15:42:32 +00:00
void Sbar_DrawScoreboard ( playerview_t * pv )
2007-02-26 03:00:25 +00:00
{
2017-05-28 15:42:32 +00:00
qboolean isdead ;
2007-02-26 03:00:25 +00:00
if ( cls . protocol = = CP_QUAKE2 )
return ;
2013-10-08 14:28:11 +00:00
if ( Key_Dest_Has ( ~ kdm_game ) )
return ;
2018-03-04 14:41:16 +00:00
# ifdef CSQC_DAT
2018-01-22 19:18:04 +00:00
if ( CSQC_DrawScores ( pv ) )
return ;
2018-03-04 14:41:16 +00:00
# endif
2018-01-22 19:18:04 +00:00
2010-11-10 03:32:47 +00:00
# ifndef CLIENTONLY
/*no scoreboard in single player (if you want bots, set deathmatch)*/
2015-06-22 11:49:15 +00:00
if ( sv . state & & sv . allocated_client_slots = = 1 )
2010-11-10 03:32:47 +00:00
{
return ;
}
# endif
2017-05-28 15:42:32 +00:00
isdead = false ;
if ( pv - > spectator & & ( cls . demoplayback = = DPB_MVD | | cls . demoplayback = = DPB_EZTV ) )
2007-02-26 03:00:25 +00:00
{
2017-05-28 15:42:32 +00:00
int t = pv - > cam_spec_track ;
if ( t > = 0 & & CAM_ISLOCKED ( pv ) & & cl . players [ t ] . statsf [ STAT_HEALTH ] < = 0 )
isdead = true ;
2007-02-26 03:00:25 +00:00
}
2017-05-28 15:42:32 +00:00
else if ( ! pv - > spectator & & pv - > statsf [ STAT_HEALTH ] < = 0 )
isdead = true ;
2007-02-26 03:00:25 +00:00
2017-05-28 15:42:32 +00:00
if ( isdead ) // && !cl.spectator)
2007-02-26 03:00:25 +00:00
{
2017-05-28 15:42:32 +00:00
if ( cl . teamplay > 0 & & ! pv - > sb_showscores )
Sbar_TeamOverlay ( pv ) ;
2007-02-26 03:00:25 +00:00
else
2017-05-28 15:42:32 +00:00
Sbar_DeathmatchOverlay ( pv , 0 ) ;
2007-02-26 03:00:25 +00:00
}
2017-05-28 15:42:32 +00:00
else if ( pv - > sb_showscores )
Sbar_DeathmatchOverlay ( pv , 0 ) ;
else if ( pv - > sb_showteamscores )
Sbar_TeamOverlay ( pv ) ;
2007-02-26 03:00:25 +00:00
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
2014-09-17 03:04:08 +00:00
# ifdef HEXEN2
2014-04-12 03:31:59 +00:00
static void Sbar_Hexen2DrawActiveStuff ( playerview_t * pv )
{
int x = r_refdef . grect . x + r_refdef . grect . width ;
mpic_t * pic ;
if ( pv - > stats [ STAT_H2_ARTIFACT_ACTIVE ] & 4 )
{
pic = R2D_SafeCachePic ( va ( " gfx/pwrbook%d.lmp " , ( ( int ) ( cl . time * 16 ) % 15 ) + 1 ) ) ;
x - = 32 ;
R2D_ScalePic ( x , r_refdef . grect . y , 32 , 32 , pic ) ;
x - = 18 ;
}
if ( pv - > stats [ STAT_H2_ARTIFACT_ACTIVE ] & 1 )
{
pic = R2D_SafeCachePic ( va ( " gfx/durhst%d.lmp " , ( ( int ) ( cl . time * 16 ) % 15 ) + 1 ) ) ;
x - = 32 ;
R2D_ScalePic ( x , r_refdef . grect . y , 32 , 32 , pic ) ;
x - = 18 ;
}
if ( pv - > stats [ STAT_H2_ARTIFACT_ACTIVE ] & 2 )
{
pic = R2D_SafeCachePic ( va ( " gfx/durshd%d.lmp " , ( ( int ) ( cl . time * 16 ) % 15 ) + 1 ) ) ;
x - = 32 ;
R2D_ScalePic ( x , r_refdef . grect . y , 32 , 32 , pic ) ;
x - = 18 ;
}
}
2013-08-27 13:18:09 +00:00
static void Sbar_Hexen2DrawItem ( playerview_t * pv , float x , float y , int itemnum )
2008-06-01 22:06:22 +00:00
{
int num ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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 )
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( x + 20 , y + 21 , 4 , 6 , R2D_SafeCachePic ( va ( " gfx/artinum%d.lmp " , num / 10 ) ) ) ;
Sbar_DrawMPic ( 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 )
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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 )
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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_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 ] ) )
2015-12-28 17:41:39 +00:00
pclass = 0 ;
2008-06-01 22:06:22 +00:00
//adjust it so there's space
sbar_rect . y - = 46 + 98 - SBAR_HEIGHT ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 0 , 46 , 160 , 98 , R2D_SafeCachePic ( " gfx/btmbar1.lmp " ) ) ;
Sbar_DrawMPic ( 160 , 46 , 160 , 98 , R2D_SafeCachePic ( " gfx/btmbar2.lmp " ) ) ;
2008-06-01 22:06:22 +00:00
Sbar_DrawTinyString ( 11 , 48 , pclassname [ pclass ] ) ;
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 11 , 58 , " int " ) ;
Sbar_DrawTinyStringf ( 33 , 58 , " %02d " , pv - > stats [ STAT_H2_INTELLIGENCE ] ) ;
2008-06-01 22:06:22 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 11 , 64 , " wis " ) ;
Sbar_DrawTinyStringf ( 33 , 64 , " %02d " , pv - > stats [ STAT_H2_WISDOM ] ) ;
2008-06-01 22:06:22 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 11 , 70 , " dex " ) ;
Sbar_DrawTinyStringf ( 33 , 70 , " %02d " , pv - > stats [ STAT_H2_DEXTERITY ] ) ;
2008-06-01 22:06:22 +00:00
2011-05-15 13:23:13 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 58 , 58 , " str " ) ;
Sbar_DrawTinyStringf ( 80 , 58 , " %02d " , pv - > stats [ STAT_H2_STRENGTH ] ) ;
2008-06-01 22:06:22 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 58 , 64 , " lvl " ) ;
Sbar_DrawTinyStringf ( 80 , 64 , " %02d " , pv - > stats [ STAT_H2_LEVEL ] ) ;
2008-06-01 22:06:22 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 58 , 70 , " exp " ) ;
Sbar_DrawTinyStringf ( 80 , 70 , " %06d " , pv - > stats [ STAT_H2_EXPERIENCE ] ) ;
2008-06-01 22:06:22 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyString ( 11 , 79 , " 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
{
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 164 + i * 40 , 115 , 28 , 19 , R2D_SafeCachePic ( va ( " gfx/armor%d.lmp " , i + 1 ) ) ) ;
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyStringf ( 168 + i * 40 , 136 , " +%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
{
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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 ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( ringpos [ i ] + 29 - ( int ) ( 26 * ( val / ( float ) 100 ) ) , 142 , 26 , 1 , R2D_SafeCachePic ( " gfx/ringhlth.lmp " ) ) ;
Sbar_DrawMPic ( 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 + + )
{
2014-10-05 20:04:11 +00:00
if ( pv - > statsstr [ STAT_H2_PUZZLE1 + i ] & & * pv - > statsstr [ STAT_H2_PUZZLE1 + i ] )
2008-06-01 22:06:22 +00:00
{
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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 + + ;
}
}
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 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 ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 0 , 0 , 160 , 46 , R2D_SafeCachePic ( " gfx/topbar1.lmp " ) ) ;
Sbar_DrawMPic ( 160 , 0 , 160 , 46 , R2D_SafeCachePic ( " gfx/topbar2.lmp " ) ) ;
Sbar_DrawMPic ( 0 , - 23 , 51 , 23 , R2D_SafeCachePic ( " gfx/topbumpl.lmp " ) ) ;
Sbar_DrawMPic ( 138 , - 8 , 39 , 8 , R2D_SafeCachePic ( " gfx/topbumpm.lmp " ) ) ;
Sbar_DrawMPic ( 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 ) ;
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyStringf ( 201 , 22 , " %03d " , val ) ;
2008-06-01 22:06:22 +00:00
if ( val )
{
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 190 , 26 - ( int ) ( ( val * 18.0 ) / ( float ) maxval + 0.5 ) , 3 , 19 , R2D_SafeCachePic ( " gfx/bmana.lmp " ) ) ;
Sbar_DrawMPic ( 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 ) ;
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyStringf ( 243 , 22 , " %03d " , val ) ;
2008-06-01 22:06:22 +00:00
if ( val )
{
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 232 , 26 - ( int ) ( ( val * 18.0 ) / ( float ) maxval + 0.5 ) , 3 , 19 , R2D_SafeCachePic ( " gfx/gmana.lmp " ) ) ;
Sbar_DrawMPic ( 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 ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 45 + ( ( int ) chainpos & 7 ) , 38 , 222 , 5 , R2D_SafeCachePic ( " gfx/hpchain.lmp " ) ) ;
Sbar_DrawMPic ( 45 + ( int ) chainpos , 36 , 35 , 9 , R2D_SafeCachePic ( " gfx/hpgem.lmp " ) ) ;
Sbar_DrawMPic ( 43 , 36 , 10 , 10 , R2D_SafeCachePic ( " gfx/chnlcov.lmp " ) ) ;
Sbar_DrawMPic ( 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 ;
2015-08-04 15:16:24 +00:00
Sbar_DrawMPic ( 3 , y , 31 , 17 , R2D_SafeCachePic ( " gfx/bmmana.lmp " ) ) ;
Sbar_DrawMPic ( 3 , y + 18 , 31 , 17 , R2D_SafeCachePic ( " gfx/gmmana.lmp " ) ) ;
2010-08-28 17:14:38 +00:00
2014-10-05 20:04:11 +00:00
Sbar_DrawTinyStringf ( 10 , y + 6 , " %03d " , pv - > stats [ STAT_H2_BLUEMANA ] ) ;
Sbar_DrawTinyStringf ( 10 , y + 18 + 6 , " %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
}
2014-09-17 03:04:08 +00:00
# endif
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 ) ;
2017-05-28 15:42:32 +00:00
if ( track = = - 1 | | ! pv - > spectator )
2013-06-23 02:17:02 +00:00
track = pv - > playernum ;
2008-11-09 22:29:28 +00:00
2013-10-29 17:38:22 +00:00
for ( p = 0 ; p < cl . allocated_client_slots ; p + + )
2008-11-09 22:29:28 +00:00
{
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 ;
2013-09-06 22:57:44 +00:00
if ( ! snd_voip_showmeter . ival )
2010-11-20 22:01:16 +00:00
return ;
2013-09-06 22:57:44 +00:00
loudness = S_Voip_Loudness ( snd_voip_showmeter . ival = = 2 ) ;
2010-11-20 22:01:16 +00:00
if ( loudness > = 0 )
{
2013-08-27 13:18:09 +00:00
int w ;
int x = 0 ;
2010-11-20 22:01:16 +00:00
int s , i ;
float range = loudness / 100.0f ;
2013-08-27 13:18:09 +00:00
w = 0 ;
2017-01-17 19:04:09 +00:00
Font_BeginString ( font_default , sbar_rect . x + min ( 320 , sbar_rect . width ) / 2 , sbar_rect . y + y + sbar_rect . height - SBAR_HEIGHT , & x , & y ) ;
2015-07-14 14:47:00 +00:00
w + = Font_CharWidth ( CON_WHITEMASK , 0xe080 ) ;
w + = Font_CharWidth ( CON_WHITEMASK , 0xe081 ) * 16 ;
w + = Font_CharWidth ( CON_WHITEMASK , 0xe082 ) ;
w + = Font_CharWidth ( CON_WHITEMASK , ' M ' ) ;
w + = Font_CharWidth ( CON_WHITEMASK , ' i ' ) ;
w + = Font_CharWidth ( CON_WHITEMASK , ' c ' ) ;
w + = Font_CharWidth ( CON_WHITEMASK , ' ' ) ;
2013-08-27 13:18:09 +00:00
x - = w / 2 ;
2015-07-14 14:47:00 +00:00
x = Font_DrawChar ( x , y , CON_WHITEMASK , ' M ' ) ;
x = Font_DrawChar ( x , y , CON_WHITEMASK , ' i ' ) ;
x = Font_DrawChar ( x , y , CON_WHITEMASK , ' c ' ) ;
x = Font_DrawChar ( x , y , CON_WHITEMASK , ' ' ) ;
x = Font_DrawChar ( x , y , CON_WHITEMASK , 0xe080 ) ;
2010-11-20 22:01:16 +00:00
s = x ;
for ( i = 0 ; i < 16 ; i + + )
2015-07-14 14:47:00 +00:00
x = Font_DrawChar ( x , y , CON_WHITEMASK , 0xe081 ) ;
Font_DrawChar ( x , y , CON_WHITEMASK , 0xe082 ) ;
Font_DrawChar ( s + ( x - s ) * range - Font_CharWidth ( CON_WHITEMASK , 0xe083 ) / 2 , y , CON_WHITEMASK , 0xe083 ) ;
2013-12-29 22:48:28 +00:00
Font_EndString ( font_default ) ;
2010-11-20 22:01:16 +00:00
}
# endif
}
2018-11-27 16:48:19 +00:00
void SCR_StringXY ( const char * str , float x , float y ) ;
2015-06-12 14:44:50 +00:00
void SCR_DrawClock ( void ) ;
void SCR_DrawGameClock ( void ) ;
static void Sbar_DrawUPS ( playerview_t * pv )
{
extern cvar_t show_speed ;
static double lastupstime ;
double t ;
static float lastups ;
char str [ 80 ] ;
float * vel ;
int track ;
extern cvar_t show_speed_x ;
extern cvar_t show_speed_y ;
if ( ! show_speed . ival )
return ;
t = Sys_DoubleTime ( ) ;
if ( ( t - lastupstime ) > = 1.0 / 20 )
{
2017-05-28 15:42:32 +00:00
if ( pv - > spectator )
2015-06-12 14:44:50 +00:00
track = Cam_TrackNum ( pv ) ;
else
track = - 1 ;
if ( track ! = - 1 )
vel = cl . inframes [ cl . validsequence & UPDATE_MASK ] . playerstate [ track ] . velocity ;
else
vel = pv - > simvel ;
lastups = sqrt ( ( vel [ 0 ] * vel [ 0 ] ) + ( vel [ 1 ] * vel [ 1 ] ) ) ;
lastupstime = t ;
}
sprintf ( str , " %3.1f UPS " , lastups ) ;
SCR_StringXY ( str , show_speed_x . value , show_speed_y . value ) ;
}
2010-11-20 22:01:16 +00:00
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
2018-03-04 14:41:16 +00:00
# ifdef CSQC_DAT
2018-01-22 19:18:04 +00:00
if ( CSQC_DrawHud ( pv ) )
return ;
2018-03-04 14:41:16 +00:00
# endif
2018-01-22 19:18:04 +00:00
2017-07-04 05:07:51 +00:00
headsup = ! ( cl_sbar . value | | ( scr_viewsize . value < 100 ) ) ;
2004-08-23 00:15:46 +00:00
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
{
2016-01-18 05:22:07 +00:00
int seat = pv - cl . playerview ;
if ( seat > = cl . splitclients )
seat = cl . splitclients - 1 ;
if ( seat < 0 )
seat = 0 ;
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 )
2016-01-18 05:22:07 +00:00
Sbar_ExecuteLayoutString ( cl . q2statusbar , seat ) ;
if ( * cl . q2layout & & ( cl . q2frame . playerstate [ seat ] . stats [ Q2STAT_LAYOUTS ] & 1 ) )
Sbar_ExecuteLayoutString ( cl . q2layout [ seat ] , seat ) ;
if ( cl . q2frame . playerstate [ seat ] . stats [ Q2STAT_LAYOUTS ] & 2 )
Sbar_Q2DrawInventory ( seat ) ;
2004-08-23 00:15:46 +00:00
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
2015-11-18 07:37:39 +00:00
minidmoverlay = cl . deathmatch & & hud_miniscores_show - > ival ;
2013-06-23 02:17:02 +00:00
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 ;
2019-09-08 15:36:44 +00:00
if ( minidmoverlay & & sbar_rect . width > = 640 & & cl . teamplay )
2013-06-23 02:17:02 +00:00
sbarwidth + = 320 ;
2019-09-08 15:36:44 +00:00
else if ( minidmoverlay & & sbar_rect . width > = 512 )
2013-06-23 02:17:02 +00:00
sbarwidth + = 192 ;
else
minidmoverlay = 0 ;
if ( scr_centersbar . ival )
{
2019-09-08 15:36:44 +00:00
float ofs = ( sbar_rect . width - 320 ) / 2 ;
if ( ofs > sbar_rect . width - sbarwidth )
ofs = sbar_rect . width - sbarwidth ;
2013-06-23 02:17:02 +00:00
sbar_rect . x + = ofs ;
sbar_rect . width - = ofs ;
2014-09-03 16:06:23 +00:00
sbar_rect_left = - ofs ;
2013-06-23 02:17:02 +00:00
}
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
2015-08-04 15:16:24 +00:00
if ( cl_sbar . value = = 1 | | scr_viewsize . value < 100 )
{
if ( sbar_rect . x > r_refdef . grect . x )
{ // left
R2D_TileClear ( r_refdef . grect . x , r_refdef . grect . y + sbar_rect . height - sb_lines , sbar_rect . x - r_refdef . grect . x , sb_lines ) ;
}
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 ) ;
}
2014-09-17 03:04:08 +00:00
# ifdef HEXEN2
2013-06-23 02:17:02 +00:00
if ( sbar_hexen2 )
{
//hexen2 hud
2020-10-06 03:17:28 +00:00
if ( pv - > sb_hexen2_infoplaque )
{
int i ;
Con_Printf ( " Objectives: \n " ) ;
for ( i = 0 ; i < 64 ; i + + )
{
if ( pv - > stats [ STAT_H2_OBJECTIVE1 + i / 32 ] & ( 1 < < ( i & 31 ) ) )
Con_Printf ( " %s \n " , T_GetInfoString ( i ) ) ;
}
pv - > sb_hexen2_infoplaque = false ;
}
2013-06-23 02:17:02 +00:00
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
2015-11-18 07:37:39 +00:00
if ( minidmoverlay )
2013-06-23 02:17:02 +00:00
Sbar_MiniDeathmatchOverlay ( pv ) ;
2014-04-12 03:31:59 +00:00
Sbar_Hexen2DrawActiveStuff ( pv ) ;
2013-06-23 02:17:02 +00:00
}
2014-09-17 03:04:08 +00:00
else
# endif
if ( sbarfailed ) //files failed to load.
2013-06-23 02:17:02 +00:00
{
//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.
// main area
if ( sb_lines > 0 )
{
2017-05-28 15:42:32 +00:00
if ( pv - > spectator )
2004-08-23 00:15:46 +00:00
{
2015-06-22 11:49:15 +00:00
if ( pv - > cam_state = = CAM_FREECAM | | pv - > cam_state = = CAM_PENDING )
2004-08-23 00:15:46 +00:00
{
2015-04-21 04:12:00 +00:00
if ( hud_tracking_show - > ival | | cl_sbar . ival )
2015-03-03 00:14:43 +00:00
{ //this is annoying.
Sbar_DrawPic ( 0 , 0 , 320 , 24 , sb_scorebar ) ;
Sbar_DrawString ( 160 - 7 * 8 , 4 , " SPECTATOR MODE " ) ;
2015-06-22 11:49:15 +00:00
if ( pv - > cam_state = = CAM_FREECAM )
Sbar_DrawString ( 160 - 14 * 8 + 4 , 12 , " Press [ATTACK] for AutoCamera " ) ;
2015-03-03 00:14:43 +00:00
}
2013-06-23 02:17:02 +00:00
}
else
{
2017-05-28 15:42:32 +00:00
if ( pv - > sb_showscores | | pv - > sb_showteamscores | | pv - > stats [ STAT_HEALTH ] < = 0 )
2013-06-23 02:17:02 +00:00
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 ) ;
2015-04-21 04:12:00 +00:00
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
}
2017-05-28 15:42:32 +00:00
else if ( pv - > sb_showscores | | pv - > sb_showteamscores | | ( pv - > stats [ STAT_HEALTH ] < = 0 & & cl . splitclients = = 1 ) )
2013-06-23 02:17:02 +00:00
{
if ( pv = = cl . playerview )
2004-08-23 00:15:46 +00:00
{
2013-06-23 02:17:02 +00:00
if ( ! cls . deathmatch )
2014-08-15 02:20:41 +00:00
{
if ( cl_sbar . value )
Sbar_DrawPic ( 0 , 0 , 320 , 24 , sb_scorebar ) ;
2013-06-23 02:17:02 +00:00
Sbar_CoopScoreboard ( ) ;
2014-08-15 02:20:41 +00:00
}
2013-06-23 02:17:02 +00:00
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
2015-08-04 15:16:24 +00:00
// top line
if ( sb_lines > 24 )
{
2017-05-28 15:42:32 +00:00
if ( ! pv - > spectator | | pv - > cam_state = = CAM_WALLCAM | | pv - > cam_state = = CAM_EYECAM )
2015-08-04 15:16:24 +00:00
Sbar_DrawInventory ( pv ) ;
else if ( cl_sbar . ival )
Sbar_DrawPic ( 0 , - 24 , 320 , 24 , sb_scorebar ) ; //make sure we don't get HoM
2019-09-08 15:36:44 +00:00
if ( ! headsup & & minidmoverlay )
2015-08-04 15:16:24 +00:00
Sbar_DrawFrags ( pv ) ;
}
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
}
2013-08-27 13:18:09 +00:00
if ( sb_lines > 24 )
Sbar_Voice ( - 32 ) ;
else if ( sb_lines > 0 )
Sbar_Voice ( - 8 ) ;
else
Sbar_Voice ( 16 ) ;
2015-06-12 14:44:50 +00:00
Sbar_DrawUPS ( pv ) ;
SCR_DrawClock ( ) ;
SCR_DrawGameClock ( ) ;
2004-08-23 00:15:46 +00:00
}
//=============================================================================
/*
= = = = = = = = = = = = = = = = = =
Sbar_IntermissionNumber
= = = = = = = = = = = = = = = = = =
*/
2013-08-27 13:18:09 +00:00
void Sbar_IntermissionNumber ( float x , float 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 ' ;
2020-09-29 07:09:01 +00:00
R2D_ScalePicAtlas ( x , y , 24 , 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); })
2013-10-29 17:38:22 +00:00
# define COL_TEAM_TEAM COLUMN("team", 4*8, {Draw_FunStringWidth ( x, y, tm->team, 4*8, false, false); \
2020-02-11 18:06:10 +00:00
if ( ourteam ) \
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
= = = = = = = = = = = = = = = = = =
*/
2017-05-28 15:42:32 +00:00
void Sbar_TeamOverlay ( playerview_t * pv )
2004-08-23 00:15:46 +00:00
{
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 ;
2014-10-05 20:04:11 +00:00
int pw , ph ;
2004-08-23 00:15:46 +00:00
2017-05-28 15:42:32 +00:00
vrect_t gr = r_refdef . grect ;
2015-06-16 23:53:58 +00:00
int rank_width = 320 - 32 * 2 ;
int startx ;
2015-06-22 11:49:15 +00:00
int trackplayer ;
2015-06-16 23:53:58 +00:00
2020-02-11 18:06:10 +00:00
qboolean ourteam ;
2013-08-27 13:18:09 +00:00
if ( ! pv )
pv = & cl . playerview [ 0 ] ;
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 )
{
2017-05-28 15:42:32 +00:00
Sbar_DeathmatchOverlay ( pv , 0 ) ;
2004-08-23 00:15:46 +00:00
return ;
}
2017-05-28 15:42:32 +00:00
y = gr . y ;
2007-07-23 18:52:11 +00:00
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 " ) ;
2014-10-05 20:04:11 +00:00
if ( pic & & R_GetShaderSizes ( pic , & pw , & ph , false ) > 0 )
2009-11-04 21:16:50 +00:00
{
2014-10-05 20:04:11 +00:00
k = ( pw * 24 ) / ph ;
2017-05-28 15:42:32 +00:00
R2D_ScalePic ( gr . x + ( gr . width - k ) / 2 , y , 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
2017-05-28 15:42:32 +00:00
x = l = gr . x + ( gr . width - 320 ) / 2 + 36 ;
2012-11-27 03:23:19 +00:00
2015-06-16 23:53:58 +00:00
startx = x ;
if ( scr_scoreboard_newstyle . ival )
{
y + = 8 ;
// Electro's scoreboard eyecandy: Draw top border
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
R2D_FillBlock ( startx - 3 , y - 1 , rank_width - 1 , 1 ) ;
// Electro's scoreboard eyecandy: Draw the title row background
R2D_ImagePaletteColour ( 1 , scr_scoreboard_fillalpha . value ) ;
R2D_FillBlock ( startx - 2 , y , rank_width - 3 , 9 ) ;
2015-12-12 19:25:15 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
2015-06-16 23:53:58 +00:00
}
2012-11-27 03:23:19 +00:00
# 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
2015-06-16 23:53:58 +00:00
if ( scr_scoreboard_newstyle . ival )
{
// Electro's scoreboard eyecandy: Draw top border (under header)
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
R2D_FillBlock ( startx - 3 , y + 1 , rank_width - 1 , 1 ) ;
// Electro's scoreboard eyecandy: Don't go over the black border, move the rest down
y + = 2 ;
// Electro's scoreboard eyecandy: Draw left border
R2D_FillBlock ( startx - 3 , y - 10 , 1 , 9 ) ;
// Electro's scoreboard eyecandy: Draw right border
R2D_FillBlock ( startx - 3 + rank_width - 2 , y - 10 , 1 , 9 ) ;
}
else if ( scr_scoreboard_titleseperator . ival )
{
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;}
2015-06-16 23:53:58 +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");
y + = 8 ;
2004-08-23 00:15:46 +00:00
2012-11-27 03:23:19 +00:00
# undef COLUMN
2015-06-16 23:53:58 +00:00
}
2012-11-27 03:23:19 +00:00
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
2017-05-28 15:42:32 +00:00
if ( pv - > spectator )
2015-06-22 11:49:15 +00:00
trackplayer = Cam_TrackNum ( pv ) ;
else
trackplayer = pv - > playernum ;
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 ;
2020-02-11 18:06:10 +00:00
ourteam = ! strncmp ( cl . players [ trackplayer ] . team , tm - > team , 16 ) ;
2015-06-16 23:53:58 +00:00
if ( scr_scoreboard_newstyle . ival )
{
// Electro's scoreboard eyecandy: Render the main background transparencies behind players row
// TODO: Alpha values on the background
int background_color ;
2020-02-11 18:06:10 +00:00
float backalpha ;
2015-06-16 23:53:58 +00:00
if ( ! ( strcmp ( " red " , tm - > team ) ) )
background_color = 4 ; // forced red
else if ( ! ( strcmp ( " blue " , tm - > team ) ) )
background_color = 13 ; // forced blue
else
background_color = tm - > bottomcolour ;
2020-02-11 18:06:10 +00:00
backalpha = scr_scoreboard_backgroundalpha . value * scr_scoreboard_fillalpha . value ;
if ( ourteam )
backalpha * = 1.7 ;
Sbar_FillPCDark ( startx - 2 , y , rank_width - 3 , 8 , background_color , backalpha ) ;
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
R2D_FillBlock ( startx - 3 , y , 1 , 8 ) ; // Electro - Border - Left
R2D_FillBlock ( startx - 3 + rank_width - 2 , y , 1 , 8 ) ; // Electro - Border - Right
2015-11-18 07:37:39 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
2015-06-16 23:53:58 +00:00
}
2004-08-23 00:15:46 +00:00
// 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
2015-06-22 11:49:15 +00:00
if ( ! strncmp ( cl . players [ trackplayer ] . team , tm - > team , 16 ) )
2009-11-04 21:16:50 +00:00
{
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 ;
}
2015-06-16 23:53:58 +00:00
if ( scr_scoreboard_newstyle . ival )
{
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
R2D_FillBlock ( startx - 3 , y , rank_width - 1 , 1 ) ; // Electro - Border - Bottom
}
else
y + = 8 ;
2017-05-28 15:42:32 +00:00
Sbar_DeathmatchOverlay ( pv , y - gr . y ) ;
2004-08-23 00:15:46 +00:00
}
/*
= = = = = = = = = = = = = = = = = =
Sbar_DeathmatchOverlay
ping time frags name
= = = = = = = = = = = = = = = = = =
*/
2007-07-23 18:52:11 +00:00
2016-08-25 00:12:14 +00:00
# define NOFILL
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 ) ; \
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x , y , num , 4 * 8 , false , false ) ; \
2016-08-25 00:12:14 +00:00
} , NOFILL )
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 ) ; \
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x , y , num , 2 * 8 , false , false ) ; \
2016-08-25 00:12:14 +00:00
} , NOFILL )
2007-08-20 02:57:11 +00:00
# define COLUMN_TIME COLUMN(time, 4*8, \
{ \
2015-06-24 17:59:57 +00:00
total = realtime - s - > realentertime ; \
2007-08-20 02:57:11 +00:00
minutes = ( int ) total / 60 ; \
sprintf ( num , " %4i " , minutes ) ; \
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x , y , num , 4 * 8 , false , false ) ; \
2016-08-25 00:12:14 +00:00
} , NOFILL )
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 ; \
2015-11-18 07:37:39 +00:00
if ( s - > spectator & & s - > spectator ! = 2 ) \
2007-08-20 02:57:11 +00:00
{ \
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x , y , " spectator " , 5 * 8 , false , false ) ; \
2007-08-20 02:57:11 +00:00
} \
else \
{ \
f = s - > frags ; \
2009-11-04 21:16:50 +00:00
sprintf ( num , " %3i " , f ) ; \
2007-08-20 02:57:11 +00:00
\
2015-06-22 11:49:15 +00:00
Font_BeginString ( font_default , x + 8 , y , & cx , & cy ) ; \
2015-07-14 14:47:00 +00:00
Font_DrawChar ( cx , cy , CON_WHITEMASK , num [ 0 ] | 0xe000 ) ; \
2015-06-22 11:49:15 +00:00
Font_BeginString ( font_default , x + 16 , y , & cx , & cy ) ; \
2015-07-14 14:47:00 +00:00
Font_DrawChar ( cx , cy , CON_WHITEMASK , num [ 1 ] | 0xe000 ) ; \
2015-06-22 11:49:15 +00:00
Font_BeginString ( font_default , x + 24 , y , & cx , & cy ) ; \
2015-07-14 14:47:00 +00:00
Font_DrawChar ( cx , cy , CON_WHITEMASK , num [ 2 ] | 0xe000 ) ; \
2015-06-22 11:49:15 +00:00
\
2020-02-11 18:06:10 +00:00
if ( isme ) \
2015-06-22 11:49:15 +00:00
{ \
Font_BeginString ( font_default , x , y , & cx , & cy ) ; \
2015-07-14 14:47:00 +00:00
Font_DrawChar ( cx , cy , CON_WHITEMASK , 16 | 0xe000 ) ; \
2015-06-22 11:49:15 +00:00
Font_BeginString ( font_default , x + 32 , y , & cx , & cy ) ; \
2015-07-14 14:47:00 +00:00
Font_DrawChar ( cx , cy , CON_WHITEMASK , 17 | 0xe000 ) ; \
2007-08-20 02:57:11 +00:00
} \
2013-12-29 22:48:28 +00:00
Font_EndString ( font_default ) ; \
2007-08-20 02:57:11 +00:00
} \
2015-07-30 16:26:15 +00:00
} , { \
if ( ! s - > spectator ) \
{ \
if ( largegame ) \
Sbar_FillPC ( x , y + 1 , 40 , 3 , top ) ; \
else \
Sbar_FillPC ( x , y , 40 , 4 , top ) ; \
Sbar_FillPC ( x , y + 4 , 40 , 4 , bottom ) ; \
} \
2007-08-20 02:57:11 +00:00
} )
# define COLUMN_TEAMNAME COLUMN(team, 4*8, \
{ \
if ( ! s - > spectator ) \
{ \
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x , y , s - > team , 4 * 8 , false , false ) ; \
2007-08-20 02:57:11 +00:00
} \
2016-08-25 00:12:14 +00:00
} , NOFILL )
2021-04-14 05:21:04 +00:00
# define COLUMN_RULESET COLUMN(ruleset, 8*8, {Draw_FunStringWidth(x, y, s->ruleset, 8*8, false, false);},NOFILL)
2016-08-25 00:12:14 +00:00
# define COLUMN_NAME COLUMN(name, namesize, {Draw_FunStringWidth(x, y, s->name, namesize, false, false);},NOFILL)
# define COLUMN_KILLS COLUMN(kils, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetKills(k)), 4*8, false, false);},NOFILL)
# define COLUMN_TKILLS COLUMN(tkil, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTKills(k)), 4*8, false, false);},NOFILL)
# define COLUMN_DEATHS COLUMN(dths, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetDeaths(k)), 4*8, false, false);},NOFILL)
# define COLUMN_TOUCHES COLUMN(tchs, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTouches(k)), 4*8, false, false);},NOFILL)
# define COLUMN_CAPS COLUMN(caps, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetCaptures(k)), 4*8, false, false);},NOFILL)
2018-07-05 16:21:44 +00:00
# define COLUMN_AFK COLUMN(afk, 0, {int cs = atoi(InfoBuf_ValueForKey(&s->userinfo, "chat")); if (cs)Draw_FunStringWidth(x+4, y, (cs&2)?"afk":"msg", 4*8, false, false);},NOFILL)
2007-07-23 18:52:11 +00:00
//columns are listed here in display order
2021-04-14 05:21:04 +00:00
# define ALLCOLUMNS COLUMN_PING COLUMN_PL COLUMN_TIME COLUMN_RULESET COLUMN_FRAGS COLUMN_TEAMNAME COLUMN_NAME COLUMN_KILLS COLUMN_TKILLS COLUMN_DEATHS COLUMN_TOUCHES COLUMN_CAPS COLUMN_AFK
2007-07-23 18:52:11 +00:00
enum
{
2015-07-30 16:26:15 +00:00
# define COLUMN(title, width, code, fill) COLUMN##title,
2007-07-23 18:52:11 +00:00
ALLCOLUMNS
# undef COLUMN
COLUMN_MAX
} ;
# define ADDCOLUMN(id) showcolumns |= (1<<id)
2017-05-28 15:42:32 +00:00
void Sbar_DeathmatchOverlay ( playerview_t * pv , int start )
2004-08-23 00:15:46 +00:00
{
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 ;
2020-02-11 18:06:10 +00:00
qboolean isme ;
2004-08-23 00:15:46 +00:00
2015-04-27 06:19:33 +00:00
vrect_t gr = r_refdef . grect ;
2016-07-12 00:40:13 +00:00
int namesize = ( cl . teamplay ? 12 * 8 : 16 * 8 ) ;
2020-02-11 18:06:10 +00:00
float backalpha ;
2015-04-27 06:19:33 +00:00
2013-07-26 17:19:06 +00:00
if ( ! pv )
return ;
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
}
2017-01-24 10:27:39 +00:00
if ( cls . protocol = = CP_NETQUAKE )
{
if ( cl . nqplayernamechanged & & cl . nqplayernamechanged < realtime )
{
cl . nqplayernamechanged = 0 ;
cls . nqexpectingstatusresponse = true ;
CL_SendClientCommand ( true , " status " ) ;
}
}
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
{
2014-10-05 20:04:11 +00:00
int w , h ;
if ( R_GetShaderSizes ( pic , & w , & h , false ) > 0 )
{
k = ( w * 24 ) / h ;
2015-04-27 06:19:33 +00:00
R2D_ScalePic ( gr . x + ( gr . width - k ) / 2 , gr . y , k , 24 , pic ) ;
2014-10-05 20:04:11 +00:00
}
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
2015-06-16 23:53:58 +00:00
Sbar_SortFrags ( true , scr_scoreboard_teamsort . ival ) ;
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 ;
}
2015-04-27 06:19:33 +00:00
y + = gr . y ;
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
2015-07-30 16:26:15 +00:00
# define COLUMN(title, cwidth, code, fill) if (rank_width+(cwidth)+8 <= gr.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
}
2015-06-16 23:53:58 +00:00
if ( scr_scoreboard_showflags . ival & & cl . teamplay & & Stats_HaveFlags ( scr_scoreboard_showflags . ival & 1 ) )
2007-07-23 18:52:11 +00:00
{
COLUMN_CAPS
}
2015-06-16 23:53:58 +00:00
if ( scr_scoreboard_showfrags . ival & & Stats_HaveKills ( ) )
2007-07-23 18:52:11 +00:00
{
COLUMN_KILLS
COLUMN_DEATHS
if ( cl . teamplay )
{
COLUMN_TKILLS
}
}
2015-06-16 23:53:58 +00:00
if ( scr_scoreboard_showflags . ival & & cl . teamplay & & Stats_HaveFlags ( scr_scoreboard_showflags . ival & 1 ) )
2007-07-23 18:52:11 +00:00
{
COLUMN_TOUCHES
}
2021-04-14 05:21:04 +00:00
if ( scr_scoreboard_showruleset . ival & & ( scr_scoreboard_showruleset . ival = = 2 | | Ruleset_GetRulesetName ( ) ) )
{
COLUMN_RULESET
}
2016-07-12 00:40:13 +00:00
COLUMN_AFK
2007-07-23 18:52:11 +00:00
# undef COLUMN
2016-07-12 00:40:13 +00:00
rank_width - = namesize ;
if ( rank_width < 320 )
{
namesize + = 320 - rank_width ;
if ( namesize > 32 * 8 )
namesize = 32 * 8 ;
}
rank_width + = namesize ;
2015-04-27 06:19:33 +00:00
startx = ( gr . width - rank_width ) / 2 ;
startx + = gr . x ;
2007-10-02 16:00:38 +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: Draw top border
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
2011-03-31 01:14:01 +00:00
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
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( 1 , scr_scoreboard_fillalpha . value ) ;
2011-03-31 01:14:01 +00:00
R2D_FillBlock ( startx - 2 , y , rank_width - 3 , 9 ) ;
2015-11-18 07:37:39 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
2007-10-02 16:00:38 +00:00
}
2007-07-23 18:52:11 +00:00
x = startx ;
2016-09-08 19:04:35 +00:00
# define COLUMN(title, width, code, fill) if (width && (showcolumns & (1<<COLUMN##title))) {Draw_FunString(x, y, #title); x += width+8;}
2007-07-23 18:52:11 +00:00
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 ;
2015-07-30 16:26:15 +00:00
# define COLUMN(title, width, code, fill) \
2007-10-02 16:00:38 +00:00
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)
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
2011-03-31 01:14:01 +00:00
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 ;
2015-07-30 16:26:15 +00:00
//drawfills (these are split out to aid batching)
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 ;
2020-02-11 18:06:10 +00:00
isme = ( pv - > cam_state = = CAM_FREECAM & & k = = pv - > playernum ) | |
( pv - > cam_state ! = CAM_FREECAM & & k = = pv - > cam_spec_track ) ;
2007-07-23 18:52:11 +00:00
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
{
2020-02-11 18:06:10 +00:00
backalpha = scr_scoreboard_backgroundalpha . value * scr_scoreboard_fillalpha . value ;
if ( isme )
backalpha * = 1.7 ;
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
2018-07-05 16:21:44 +00:00
Q_strncpyz ( team , InfoBuf_ValueForKey ( & s - > userinfo , " team " ) , sizeof ( team ) ) ;
2007-10-02 16:00:38 +00:00
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
2020-02-11 18:06:10 +00:00
Sbar_FillPCDark ( startx - 2 , y , rank_width - 3 , skip , background_color , backalpha ) ;
2007-10-02 16:00:38 +00:00
}
2010-11-20 22:01:16 +00:00
else if ( S_Voip_Speaking ( k ) )
2020-02-11 18:06:10 +00:00
Sbar_FillPCDark ( startx - 2 , y , rank_width - 3 , skip , 0x00ff00 , backalpha ) ;
2007-10-02 16:00:38 +00:00
else
2011-03-30 17:34:37 +00:00
{
2020-02-11 18:06:10 +00:00
R2D_ImagePaletteColour ( 2 , backalpha ) ;
2011-03-31 01:14:01 +00:00
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
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
2011-03-31 01:14:01 +00:00
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 ;
2015-07-30 16:26:15 +00:00
# define COLUMN(title, width, code, fills) \
2007-10-02 16:00:38 +00:00
if ( showcolumns & ( 1 < < COLUMN # # title ) ) \
{ \
2015-07-30 16:26:15 +00:00
fills \
2007-10-02 16:00:38 +00:00
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
{
2015-06-16 23:53:58 +00:00
R2D_ImagePaletteColour ( 0 , scr_scoreboard_fillalpha . value ) ;
2011-03-31 01:14:01 +00:00
R2D_FillBlock ( startx - 3 , y + skip , rank_width - 1 , 1 ) ; // Electro - Border - Bottom
2011-03-30 17:34:37 +00:00
}
2015-07-30 16:26:15 +00:00
R2D_ImageColours ( 1.0 , 1.0 , 1.0 , 1.0 ) ;
y - = i * skip ;
//text parts
for ( i = 0 ; i < scoreboardlines ; i + + )
{
// TODO: Sort players so that the leading teams are drawn first
k = fragsort [ i ] ;
s = & cl . players [ k ] ;
if ( ! s - > name [ 0 ] )
continue ;
y + = skip ;
if ( y > vid . height - 10 )
break ;
2020-02-11 18:06:10 +00:00
isme = ( pv - > cam_state = = CAM_FREECAM & & k = = pv - > playernum ) | |
( pv - > cam_state ! = CAM_FREECAM & & k = = pv - > cam_spec_track ) ;
2015-07-30 16:26:15 +00:00
x = startx ;
# define COLUMN(title, width, code, fills) \
if ( showcolumns & ( 1 < < COLUMN # # title ) ) \
{ \
code \
x + = width + 8 ; \
}
ALLCOLUMNS
# undef COLUMN
}
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 ;
}
/*
= = = = = = = = = = = = = = = = = =
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
2015-07-30 16:26:15 +00:00
for ( f = i , py = y ; f < scoreboardlines & & py < sbar_rect . y + sbar_rect . height - 8 + 1 ; f + + )
2004-08-23 00:15:46 +00:00
{
2015-07-30 16:26:15 +00:00
k = fragsort [ f ] ;
2004-08-23 00:15:46 +00:00
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
2015-07-30 16:26:15 +00:00
Sbar_FillPC ( x , py + 1 , 40 , 3 , top ) ;
Sbar_FillPC ( x , py + 4 , 40 , 4 , bottom ) ;
py + = 8 ;
}
2015-11-18 07:37:39 +00:00
R2D_ImageColours ( 1 , 1 , 1 , 1 ) ;
2015-07-30 16:26:15 +00:00
for ( /* */ ; i < scoreboardlines & & y < sbar_rect . y + sbar_rect . height - 8 + 1 ; i + + )
{
k = fragsort [ i ] ;
s = & cl . players [ k ] ;
if ( ! s - > name [ 0 ] )
continue ;
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
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x + 8 , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , num [ 0 ] | 0xe000 ) ;
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x + 16 , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , num [ 1 ] | 0xe000 ) ;
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x + 24 , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , num [ 2 ] | 0xe000 ) ;
2004-08-23 00:15:46 +00:00
2017-05-28 15:42:32 +00:00
if ( ( pv - > spectator & & k = = pv - > cam_spec_track & & pv - > cam_state ! = CAM_FREECAM ) | |
( ! pv - > spectator & & k = = pv - > playernum ) )
2004-08-23 00:15:46 +00:00
{
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , 16 | 0xe000 ) ;
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x + 32 , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , 17 | 0xe000 ) ;
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 )
{
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x + 48 , y , s - > team , 32 , false , false ) ;
Draw_FunStringWidth ( x + 48 + 40 , y , name , MAX_DISPLAYEDNAME * 8 , false , false ) ;
2004-08-23 00:15:46 +00:00
}
else
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x + 48 , y , name , MAX_DISPLAYEDNAME * 8 , false , false ) ;
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
2013-10-29 17:38:22 +00:00
Draw_FunStringWidth ( x , y , tm - > team , 32 , false , false ) ;
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
{
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x - 8 , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , 16 | 0xe000 ) ;
2013-12-29 22:48:28 +00:00
Font_BeginString ( font_default , x + 32 , y , & px , & py ) ;
2015-07-14 14:47:00 +00:00
Font_DrawChar ( px , py , CON_WHITEMASK , 17 | 0xe000 ) ;
2013-12-29 22:48:28 +00:00
Font_EndString ( font_default ) ;
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 ;
}
}
2017-05-28 15:42:32 +00:00
void Sbar_CoopIntermission ( playerview_t * pv )
2004-08-23 00:15:46 +00:00
{
2004-12-24 08:45:56 +00:00
mpic_t * pic ;
2004-08-23 00:15:46 +00:00
int dig ;
int num ;
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 ;
2020-09-29 07:09:01 +00:00
R2D_ScalePicAtlas ( ( sbar_rect . width - 320 ) / 2 + 230 , ( sbar_rect . height - 200 ) / 2 + 64 , 24 , 24 , sb_colon ) ;
R2D_ScalePicAtlas ( ( sbar_rect . width - 320 ) / 2 + 254 , ( sbar_rect . height - 200 ) / 2 + 64 , 24 , 24 , sb_nums [ 0 ] [ num / 10 ] ) ;
R2D_ScalePicAtlas ( ( sbar_rect . width - 320 ) / 2 + 278 , ( sbar_rect . height - 200 ) / 2 + 64 , 24 , 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...
2017-05-28 15:42:32 +00:00
Sbar_IntermissionNumber ( ( sbar_rect . width - 320 ) / 2 + 230 - 24 * 4 , ( sbar_rect . height - 200 ) / 2 + 104 , pv - > stats [ STAT_SECRETS ] , 4 , 0 , false ) ;
2020-09-29 07:09:01 +00:00
R2D_ScalePicAtlas ( ( sbar_rect . width - 320 ) / 2 + 230 , ( sbar_rect . height - 200 ) / 2 + 104 , 24 , 24 , sb_slash ) ;
2017-05-28 15:42:32 +00:00
Sbar_IntermissionNumber ( ( sbar_rect . width - 320 ) / 2 + 254 , ( sbar_rect . height - 200 ) / 2 + 104 , pv - > stats [ STAT_TOTALSECRETS ] , 4 , 0 , true ) ;
2004-08-23 00:15:46 +00:00
2017-05-28 15:42:32 +00:00
Sbar_IntermissionNumber ( ( sbar_rect . width - 320 ) / 2 + 230 - 24 * 4 , ( sbar_rect . height - 200 ) / 2 + 144 , pv - > stats [ STAT_MONSTERS ] , 4 , 0 , false ) ;
2020-09-29 07:09:01 +00:00
R2D_ScalePicAtlas ( ( sbar_rect . width - 320 ) / 2 + 230 , ( sbar_rect . height - 200 ) / 2 + 144 , 24 , 24 , sb_slash ) ;
2017-05-28 15:42:32 +00:00
Sbar_IntermissionNumber ( ( sbar_rect . width - 320 ) / 2 + 254 , ( sbar_rect . height - 200 ) / 2 + 144 , pv - > stats [ STAT_TOTALMONSTERS ] , 4 , 0 , true ) ;
2004-08-23 00:15:46 +00:00
}
/*
= = = = = = = = = = = = = = = = = =
Sbar_IntermissionOverlay
= = = = = = = = = = = = = = = = = =
*/
2017-05-28 15:42:32 +00:00
void Sbar_IntermissionOverlay ( playerview_t * pv )
2004-08-23 00:15:46 +00:00
{
2007-05-25 22:16:29 +00:00
Sbar_Start ( ) ;
2013-03-12 22:53:23 +00:00
if ( ! cls . deathmatch )
2017-05-28 15:42:32 +00:00
Sbar_CoopIntermission ( pv ) ;
else if ( cl . teamplay > 0 & & ! pv - > sb_showscores )
Sbar_TeamOverlay ( pv ) ;
2004-08-23 00:15:46 +00:00
else
2017-05-28 15:42:32 +00:00
Sbar_DeathmatchOverlay ( pv , 0 ) ;
2004-08-23 00:15:46 +00:00
}
2015-09-01 04:45:15 +00:00
# endif