mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-10 07:11:36 +00:00
Elder:
1.29h source port files
This commit is contained in:
Victor Chow
parent
f8729be656
commit
3f461d7e4d
15 changed files with 116 additions and 103 deletions
|
|
@ -422,6 +422,8 @@ static int propMapB[26][3] = {
|
|||
#define PROPB_SPACE_WIDTH 12
|
||||
#define PROPB_HEIGHT 36
|
||||
|
||||
// bk001205 - code below duplicated in cgame/cg_drawtools.c
|
||||
// bk001205 - FIXME: does this belong in ui_shared.c?
|
||||
/*
|
||||
=================
|
||||
UI_DrawBannerString
|
||||
|
|
@ -430,7 +432,7 @@ UI_DrawBannerString
|
|||
static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color )
|
||||
{
|
||||
const char* s;
|
||||
char ch;
|
||||
unsigned char ch; // bk001204 - unsigned
|
||||
float ax;
|
||||
float ay;
|
||||
float aw;
|
||||
|
|
@ -540,10 +542,10 @@ int UI_ProportionalStringWidth( const char* str ) {
|
|||
static void UI_DrawProportionalString2( int x, int y, const char* str, vec4_t color, float sizeScale, qhandle_t charset )
|
||||
{
|
||||
const char* s;
|
||||
char ch;
|
||||
unsigned char ch; // bk001204 - unsigned
|
||||
float ax;
|
||||
float ay;
|
||||
float aw;
|
||||
float aw = 0; // bk001204 - init
|
||||
float ah;
|
||||
float frow;
|
||||
float fcol;
|
||||
|
|
@ -829,6 +831,8 @@ static void NeedCDKeyAction( qboolean result ) {
|
|||
}
|
||||
}
|
||||
|
||||
// bk001205 - for LCC
|
||||
typedef void (*voidfunc_f)(void);
|
||||
|
||||
void UI_SetActiveMenu( uiMenuCommand_t menu ) {
|
||||
// this should be the ONLY way the menu system is brought up
|
||||
|
|
@ -843,10 +847,10 @@ void UI_SetActiveMenu( uiMenuCommand_t menu ) {
|
|||
UI_MainMenu();
|
||||
return;
|
||||
case UIMENU_NEED_CD:
|
||||
UI_ConfirmMenu( "Insert the CD", NULL, NeedCDAction );
|
||||
UI_ConfirmMenu( "Insert the CD", (voidfunc_f)NULL, NeedCDAction );
|
||||
return;
|
||||
case UIMENU_BAD_CD_KEY:
|
||||
UI_ConfirmMenu( "Bad CD Key", NULL, NeedCDKeyAction );
|
||||
UI_ConfirmMenu( "Bad CD Key", (voidfunc_f)NULL, NeedCDKeyAction );
|
||||
return;
|
||||
case UIMENU_INGAME:
|
||||
/*
|
||||
|
|
@ -857,6 +861,15 @@ void UI_SetActiveMenu( uiMenuCommand_t menu ) {
|
|||
trap_Cvar_Set( "cl_paused", "1" );
|
||||
UI_InGameMenu();
|
||||
return;
|
||||
|
||||
// bk001204
|
||||
case UIMENU_TEAM:
|
||||
case UIMENU_POSTGAME:
|
||||
default:
|
||||
#ifndef NDEBUG
|
||||
Com_Printf("UI_SetActiveMenu: bad enum %d\n", menu );
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,6 +63,15 @@ static void UI_DisplayDownloadInfo( const char *downloadName ) {
|
|||
downloadCount = trap_Cvar_VariableValue( "cl_downloadCount" );
|
||||
downloadTime = trap_Cvar_VariableValue( "cl_downloadTime" );
|
||||
|
||||
#if 0 // bk010104
|
||||
fprintf( stderr, "\n\n-----------------------------------------------\n");
|
||||
fprintf( stderr, "DB: downloadSize: %16d\n", downloadSize );
|
||||
fprintf( stderr, "DB: downloadCount: %16d\n", downloadCount );
|
||||
fprintf( stderr, "DB: downloadTime: %16d\n", downloadTime );
|
||||
fprintf( stderr, "DB: UI realtime: %16d\n", uis.realtime ); // bk
|
||||
fprintf( stderr, "DB: UI frametime: %16d\n", uis.frametime ); // bk
|
||||
#endif
|
||||
|
||||
leftWidth = width = UI_ProportionalStringWidth( dlText ) * UI_ProportionalSizeScale( style );
|
||||
width = UI_ProportionalStringWidth( etaText ) * UI_ProportionalSizeScale( style );
|
||||
if (width > leftWidth) leftWidth = width;
|
||||
|
|
@ -90,11 +99,20 @@ static void UI_DisplayDownloadInfo( const char *downloadName ) {
|
|||
UI_DrawProportionalString( leftWidth, 192,
|
||||
va("(%s of %s copied)", dlSizeBuf, totalSizeBuf), style, color_white );
|
||||
} else {
|
||||
// bk010108
|
||||
//float elapsedTime = (float)(uis.realtime - downloadTime); // current - start (msecs)
|
||||
//elapsedTime = elapsedTime * 0.001f; // in seconds
|
||||
//if ( elapsedTime <= 0.0f ) elapsedTime == 0.0f;
|
||||
if ((uis.realtime - downloadTime) / 1000) {
|
||||
xferRate = downloadCount / ((uis.realtime - downloadTime) / 1000);
|
||||
//xferRate = (int)( ((float)downloadCount) / elapsedTime);
|
||||
} else {
|
||||
xferRate = 0;
|
||||
}
|
||||
|
||||
//fprintf( stderr, "DB: elapsedTime: %16.8f\n", elapsedTime ); // bk
|
||||
//fprintf( stderr, "DB: xferRate: %16d\n", xferRate ); // bk
|
||||
|
||||
UI_ReadableSize( xferRateBuf, sizeof xferRateBuf, xferRate );
|
||||
|
||||
// Extrapolate estimated completion time
|
||||
|
|
@ -102,8 +120,10 @@ static void UI_DisplayDownloadInfo( const char *downloadName ) {
|
|||
int n = downloadSize / xferRate; // estimated time for entire d/l in secs
|
||||
|
||||
// We do it in K (/1024) because we'd overflow around 4MB
|
||||
UI_PrintTime ( dlTimeBuf, sizeof dlTimeBuf,
|
||||
(n - (((downloadCount/1024) * n) / (downloadSize/1024))) * 1000);
|
||||
n = (n - (((downloadCount/1024) * n) / (downloadSize/1024))) * 1000;
|
||||
|
||||
UI_PrintTime ( dlTimeBuf, sizeof dlTimeBuf, n ); // bk010104
|
||||
//(n - (((downloadCount/1024) * n) / (downloadSize/1024))) * 1000);
|
||||
|
||||
UI_DrawProportionalString( leftWidth, 160,
|
||||
dlTimeBuf, style, color_white );
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ typedef struct
|
|||
|
||||
static controls_t s_controls;
|
||||
|
||||
static vec4_t controls_binding_color = {1.00f, 0.43f, 0.00f, 1.00f};
|
||||
static vec4_t controls_binding_color = {1.00f, 0.43f, 0.00f, 1.00f}; // bk: Win32 C4305
|
||||
|
||||
static bind_t g_bindings[] =
|
||||
{
|
||||
|
|
@ -622,7 +622,8 @@ static void Controls_Update( void ) {
|
|||
// disable all controls in all groups
|
||||
for( i = 0; i < C_MAX; i++ ) {
|
||||
controls = g_controls[i];
|
||||
for( j = 0; control = controls[j]; j++ ) {
|
||||
// bk001204 - parentheses
|
||||
for( j = 0; (control = controls[j]) ; j++ ) {
|
||||
control->flags |= (QMF_HIDDEN|QMF_INACTIVE);
|
||||
}
|
||||
}
|
||||
|
|
@ -630,13 +631,15 @@ static void Controls_Update( void ) {
|
|||
controls = g_controls[s_controls.section];
|
||||
|
||||
// enable controls in active group (and count number of items for vertical centering)
|
||||
for( j = 0; control = controls[j]; j++ ) {
|
||||
// bk001204 - parentheses
|
||||
for( j = 0; (control = controls[j]) ; j++ ) {
|
||||
control->flags &= ~(QMF_GRAYED|QMF_HIDDEN|QMF_INACTIVE);
|
||||
}
|
||||
|
||||
// position controls
|
||||
y = ( SCREEN_HEIGHT - j * SMALLCHAR_HEIGHT ) / 2;
|
||||
for( j = 0; control = controls[j]; j++, y += SMALLCHAR_HEIGHT ) {
|
||||
// bk001204 - parentheses
|
||||
for( j = 0; (control = controls[j]) ; j++, y += SMALLCHAR_HEIGHT ) {
|
||||
control->x = 320;
|
||||
control->y = y;
|
||||
control->left = 320 - 19*SMALLCHAR_WIDTH;
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ static void Demos_MenuEvent( void *ptr, int event ) {
|
|||
switch( ((menucommon_s*)ptr)->id ) {
|
||||
case ID_GO:
|
||||
UI_ForceMenuOff ();
|
||||
trap_Cmd_ExecuteText( EXEC_APPEND, va( "demo %s.dm3\n", s_demos.list.itemnames[s_demos.list.curvalue] ) );
|
||||
trap_Cmd_ExecuteText( EXEC_APPEND, va( "demo %s\n",
|
||||
s_demos.list.itemnames[s_demos.list.curvalue]) );
|
||||
break;
|
||||
|
||||
case ID_BACK:
|
||||
|
|
@ -143,7 +144,7 @@ Demos_MenuInit
|
|||
static void Demos_MenuInit( void ) {
|
||||
int i;
|
||||
int len;
|
||||
char *demoname;
|
||||
char *demoname, extension[32];
|
||||
|
||||
memset( &s_demos, 0 ,sizeof(demos_t) );
|
||||
s_demos.menu.key = UI_DemosMenu_Key;
|
||||
|
|
@ -297,7 +298,8 @@ static void Demos_MenuInit( void ) {
|
|||
s_demos.list.generic.y = 64;
|
||||
s_demos.list.width = 16;
|
||||
s_demos.list.height = 14;
|
||||
s_demos.list.numitems = trap_FS_GetFileList( "demos", "dm3", s_demos.names, NAMEBUFSIZE );
|
||||
Com_sprintf(extension, sizeof(extension), "dm_%d", (int)trap_Cvar_VariableValue( "protocol" ) );
|
||||
s_demos.list.numitems = trap_FS_GetFileList( "demos", extension, s_demos.names, NAMEBUFSIZE );
|
||||
s_demos.list.itemnames = (const char **)s_demos.demolist;
|
||||
s_demos.list.columns = 3;
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,9 @@ static void InGame_QuitAction( qboolean result ) {
|
|||
InGame_Event
|
||||
=================
|
||||
*/
|
||||
// bk001205 - for LCC
|
||||
typedef void (*voidfunc_f)(void);
|
||||
|
||||
void InGame_Event( void *ptr, int notification ) {
|
||||
if( notification != QM_ACTIVATED ) {
|
||||
return;
|
||||
|
|
@ -100,11 +103,11 @@ void InGame_Event( void *ptr, int notification ) {
|
|||
break;
|
||||
|
||||
case ID_RESTART:
|
||||
UI_ConfirmMenu( "RESTART ARENA?", NULL, InGame_RestartAction );
|
||||
UI_ConfirmMenu( "RESTART ARENA?", (voidfunc_f)NULL, InGame_RestartAction );
|
||||
break;
|
||||
|
||||
case ID_QUIT:
|
||||
UI_ConfirmMenu( "EXIT GAME?", NULL, InGame_QuitAction );
|
||||
UI_ConfirmMenu( "EXIT GAME?", (voidfunc_f)NULL, InGame_QuitAction );
|
||||
break;
|
||||
|
||||
case ID_SERVERINFO:
|
||||
|
|
@ -314,7 +317,7 @@ void InGame_Cache( void ) {
|
|||
/*
|
||||
=================
|
||||
UI_InGameMenu
|
||||
=====================
|
||||
=================
|
||||
*/
|
||||
void UI_InGameMenu( void ) {
|
||||
// force as top level menu
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include "../game/q_shared.h"
|
||||
#include "../cgame/tr_types.h"
|
||||
//NOTE: include the ui_public.h from the new UI
|
||||
#include "../ui/ui_public.h"
|
||||
#include "../ui/ui_public.h" // bk001205 - yes, do have to use this
|
||||
//redefine to old API version
|
||||
#undef UI_API_VERSION
|
||||
#define UI_API_VERSION 4
|
||||
|
|
@ -668,6 +668,8 @@ int trap_MemoryRemaining( void );
|
|||
void trap_GetCDKey( char *buf, int buflen );
|
||||
void trap_SetCDKey( char *buf );
|
||||
|
||||
qboolean trap_VerifyCDKey( const char *key, const char *chksum); // bk001208 - RC4
|
||||
|
||||
//
|
||||
// ui_addbots.c
|
||||
//
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a
|
|||
UI_DrawConnectScreen( arg0 );
|
||||
return 0;
|
||||
case UI_HASUNIQUECDKEY: // mod authors need to observe this
|
||||
return qfalse;
|
||||
return qtrue; // bk010117 - change this to qfalse for mods!
|
||||
}
|
||||
|
||||
return -1;
|
||||
|
|
@ -136,7 +136,8 @@ vmCvar_t ui_server16;
|
|||
|
||||
vmCvar_t ui_cdkeychecked;
|
||||
|
||||
cvarTable_t cvarTable[] = {
|
||||
// bk001129 - made static to avoid aliasing.
|
||||
static cvarTable_t cvarTable[] = {
|
||||
{ &ui_ffa_fraglimit, "ui_ffa_fraglimit", "20", CVAR_ARCHIVE },
|
||||
{ &ui_ffa_timelimit, "ui_ffa_timelimit", "0", CVAR_ARCHIVE },
|
||||
|
||||
|
|
@ -195,7 +196,8 @@ cvarTable_t cvarTable[] = {
|
|||
{ &ui_cdkeychecked, "ui_cdkeychecked", "0", CVAR_ROM }
|
||||
};
|
||||
|
||||
int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]);
|
||||
// bk001129 - made static to avoid aliasing
|
||||
static int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ static void UI_Mods_ParseInfos( char *modDir, char *modDesc ) {
|
|||
}
|
||||
|
||||
|
||||
#if 0 // bk001204 - unused
|
||||
/*
|
||||
===============
|
||||
UI_Mods_LoadModsFromFile
|
||||
|
|
@ -133,6 +134,7 @@ static void UI_Mods_LoadModsFromFile( char *filename ) {
|
|||
|
||||
UI_Mods_ParseInfos( filename, buf );
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ static void PlayerSettings_SaveChanges( void ) {
|
|||
trap_Cvar_SetValue( "handicap", 100 - s_playersettings.handicap.curvalue * 5 );
|
||||
|
||||
// effects color
|
||||
trap_Cvar_SetValue( "color", uitogamecode[s_playersettings.effects.curvalue] );
|
||||
trap_Cvar_SetValue( "color1", uitogamecode[s_playersettings.effects.curvalue] );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -294,7 +294,7 @@ static void PlayerSettings_SetMenuItems( void ) {
|
|||
Q_strncpyz( s_playersettings.name.field.buffer, UI_Cvar_VariableString("name"), sizeof(s_playersettings.name.field.buffer) );
|
||||
|
||||
// effects color
|
||||
c = trap_Cvar_VariableValue( "color" ) - 1;
|
||||
c = trap_Cvar_VariableValue( "color1" ) - 1;
|
||||
if( c < 0 || c > 6 ) {
|
||||
c = 6;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,29 +20,29 @@ static qhandle_t sliderBar;
|
|||
static qhandle_t sliderButton_0;
|
||||
static qhandle_t sliderButton_1;
|
||||
|
||||
vec4_t menu_text_color = {1.0, 1.0, 1.0, 1.0};
|
||||
vec4_t menu_dim_color = {0.0, 0.0, 0.0, 0.75};
|
||||
vec4_t color_black = {0.00, 0.00, 0.00, 1.00};
|
||||
vec4_t color_white = {1.00, 1.00, 1.00, 1.00};
|
||||
vec4_t color_yellow = {1.00, 1.00, 0.00, 1.00};
|
||||
vec4_t color_blue = {0.00, 0.00, 1.00, 1.00};
|
||||
vec4_t menu_text_color = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||
vec4_t menu_dim_color = {0.0f, 0.0f, 0.0f, 0.75f};
|
||||
vec4_t color_black = {0.00f, 0.00f, 0.00f, 1.00f};
|
||||
vec4_t color_white = {1.00f, 1.00f, 1.00f, 1.00f};
|
||||
vec4_t color_yellow = {1.00f, 1.00f, 0.00f, 1.00f};
|
||||
vec4_t color_blue = {0.00f, 0.00f, 1.00f, 1.00f};
|
||||
vec4_t color_lightOrange = {1.00f, 0.68f, 0.00f, 1.00f };
|
||||
vec4_t color_orange = {1.00f, 0.43f, 0.00f, 1.00f};
|
||||
vec4_t color_red = {1.00, 0.00, 0.00, 1.00};
|
||||
vec4_t color_dim = {0.00, 0.00, 0.00, 0.25};
|
||||
vec4_t color_red = {1.00f, 0.00f, 0.00f, 1.00f};
|
||||
vec4_t color_dim = {0.00f, 0.00f, 0.00f, 0.25f};
|
||||
|
||||
//Elder: Added new colors
|
||||
vec4_t color_deepdim = {0.00, 0.00, 0.00, 0.75};
|
||||
|
||||
// current color scheme
|
||||
vec4_t pulse_color = {1.00, 1.00, 1.00, 1.00};
|
||||
vec4_t text_color_disabled = {0.50, 0.50, 0.50, 1.00}; // light gray
|
||||
vec4_t text_color_normal = {1.00, 0.43f, 0.00, 1.00}; // light orange
|
||||
vec4_t pulse_color = {1.00f, 1.00f, 1.00f, 1.00f};
|
||||
vec4_t text_color_disabled = {0.50f, 0.50f, 0.50f, 1.00f}; // light gray
|
||||
vec4_t text_color_normal = {1.00f, 0.43f, 0.00f, 1.00f}; // light orange
|
||||
//Elder: modified
|
||||
vec4_t text_color_highlight = {1.00, 1.00, 1.00, 1.00}; // bright white
|
||||
//vec4_t text_color_highlight = {1.00, 1.00, 0.00, 1.00}; // bright yellow
|
||||
vec4_t listbar_color = {1.00, 0.43f, 0.00, 0.30f}; // transluscent orange
|
||||
vec4_t text_color_status = {1.00, 1.00, 1.00, 1.00}; // bright white
|
||||
vec4_t text_color_highlight = {1.00f, 1.00f, 1.00f, 1.00f}; // bright white
|
||||
//vec4_t text_color_highlight = {1.00f, 1.00f, 0.00f, 1.00f}; // bright yellow
|
||||
vec4_t listbar_color = {1.00f, 0.43f, 0.00f, 0.30f}; // transluscent orange
|
||||
vec4_t text_color_status = {1.00f, 1.00f, 1.00f, 1.00f}; // bright white
|
||||
|
||||
// action widget
|
||||
static void Action_Init( menuaction_s *a );
|
||||
|
|
@ -314,7 +314,10 @@ void Bitmap_Draw( menubitmap_s *b )
|
|||
if (b->shader)
|
||||
UI_DrawHandlePic( x, y, w, h, b->shader );
|
||||
|
||||
if ((b->generic.flags & QMF_PULSE) || (b->generic.flags & QMF_PULSEIFFOCUS) && (Menu_ItemAtCursor( b->generic.parent ) == b))
|
||||
// bk001204 - parentheses
|
||||
if ( ( (b->generic.flags & QMF_PULSE)
|
||||
|| (b->generic.flags & QMF_PULSEIFFOCUS) )
|
||||
&& (Menu_ItemAtCursor( b->generic.parent ) == b))
|
||||
{
|
||||
if (b->focuscolor)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ MULTIPLAYER MENU (SERVER BROWSER)
|
|||
|
||||
|
||||
#define MAX_GLOBALSERVERS 128
|
||||
#define MAX_PINGREQUESTS 16
|
||||
#define MAX_PINGREQUESTS 32
|
||||
#define MAX_ADDRESSLENGTH 64
|
||||
#define MAX_HOSTNAMELENGTH 22
|
||||
#define MAX_MAPNAMELENGTH 16
|
||||
|
|
@ -39,7 +39,6 @@ MULTIPLAYER MENU (SERVER BROWSER)
|
|||
#define ART_UNKNOWNMAP "menu/art/unknownmap"
|
||||
#define ART_REMOVE0 "menu/art/delete_0"
|
||||
#define ART_REMOVE1 "menu/art/delete_1"
|
||||
#define GLOBALRANKINGS_LOGO "menu/art/gr/grlogo"
|
||||
|
||||
#define ID_MASTER 10
|
||||
#define ID_GAMETYPE 11
|
||||
|
|
@ -127,7 +126,6 @@ static char* netnames[] = {
|
|||
};
|
||||
|
||||
static char quake3worldMessage[] = "Visit www.quake3world.com - News, Community, Events, Files";
|
||||
static char globalRankingsMessage[] = "Visit www.globalrankings.com - you kick ass, we'll take names";
|
||||
|
||||
typedef struct {
|
||||
char adrstr[MAX_ADDRESSLENGTH];
|
||||
|
|
@ -136,7 +134,7 @@ typedef struct {
|
|||
|
||||
typedef struct servernode_s {
|
||||
char adrstr[MAX_ADDRESSLENGTH];
|
||||
char hostname[MAX_HOSTNAMELENGTH];
|
||||
char hostname[MAX_HOSTNAMELENGTH+3];
|
||||
char mapname[MAX_MAPNAMELENGTH];
|
||||
int numclients;
|
||||
int maxclients;
|
||||
|
|
@ -200,12 +198,6 @@ typedef struct {
|
|||
char favoriteaddresses[MAX_FAVORITESERVERS][MAX_ADDRESSLENGTH];
|
||||
int numfavoriteaddresses;
|
||||
|
||||
|
||||
menubitmap_s grlogo;
|
||||
menubitmap_s grletters;
|
||||
menutext_s league;
|
||||
menutext_s practice;
|
||||
|
||||
} arenaservers_t;
|
||||
|
||||
static arenaservers_t g_arenaservers;
|
||||
|
|
@ -384,9 +376,6 @@ static void ArenaServers_UpdateMenu( void ) {
|
|||
else {
|
||||
g_arenaservers.statusbar.string = "";
|
||||
}
|
||||
if (!(g_arenaservers.grlogo.generic.flags & QMF_HIDDEN)) {
|
||||
g_arenaservers.statusbar.string = globalRankingsMessage;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -626,6 +615,9 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime )
|
|||
servernodeptr->pingtime = pingtime;
|
||||
servernodeptr->minPing = atoi( Info_ValueForKey( info, "minPing") );
|
||||
servernodeptr->maxPing = atoi( Info_ValueForKey( info, "maxPing") );
|
||||
if (atoi( Info_ValueForKey( info, "sv_allowAnonymous")) != 0 ) {
|
||||
Com_sprintf(servernodeptr->hostname, MAX_HOSTNAMELENGTH, "(A)%s", servernodeptr->hostname);
|
||||
}
|
||||
|
||||
/*
|
||||
s = Info_ValueForKey( info, "nettype" );
|
||||
|
|
@ -654,7 +646,7 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime )
|
|||
i = 12;
|
||||
}
|
||||
if( *s ) {
|
||||
servernodeptr->gametype = -1;
|
||||
servernodeptr->gametype = i;//-1;
|
||||
Q_strncpyz( servernodeptr->gamename, s, sizeof(servernodeptr->gamename) );
|
||||
}
|
||||
else {
|
||||
|
|
@ -842,7 +834,7 @@ static void ArenaServers_DoRefresh( void )
|
|||
}
|
||||
|
||||
// trigger at 10Hz intervals
|
||||
g_arenaservers.nextpingtime = uis.realtime + 50;
|
||||
g_arenaservers.nextpingtime = uis.realtime + 10;
|
||||
|
||||
// process ping results
|
||||
maxPing = ArenaServers_MaxPing();
|
||||
|
|
@ -1269,7 +1261,7 @@ static void ArenaServers_MenuInit( void ) {
|
|||
int type;
|
||||
int y;
|
||||
static char statusbuffer[MAX_STATUSLENGTH];
|
||||
static char leaguebuffer[MAX_LEAGUELENGTH];
|
||||
// static char leaguebuffer[MAX_LEAGUELENGTH]; // TTimo: unused
|
||||
|
||||
// zero set all our globals
|
||||
memset( &g_arenaservers, 0 ,sizeof(arenaservers_t) );
|
||||
|
|
@ -1331,36 +1323,6 @@ static void ArenaServers_MenuInit( void ) {
|
|||
g_arenaservers.exitm.color = color_red;
|
||||
g_arenaservers.exitm.style = UI_CENTER | UI_DROPSHADOW;
|
||||
|
||||
g_arenaservers.grlogo.generic.type = MTYPE_BITMAP;
|
||||
g_arenaservers.grlogo.generic.name = GLOBALRANKINGS_LOGO;
|
||||
g_arenaservers.grlogo.generic.flags = QMF_INACTIVE|QMF_HIDDEN;
|
||||
g_arenaservers.grlogo.generic.x = 530;
|
||||
g_arenaservers.grlogo.generic.y = 40;
|
||||
g_arenaservers.grlogo.width = 32;
|
||||
g_arenaservers.grlogo.height = 64;
|
||||
|
||||
|
||||
g_arenaservers.league.generic.type = MTYPE_TEXT;
|
||||
g_arenaservers.league.generic.flags = QMF_HIDDEN;
|
||||
g_arenaservers.league.generic.x = g_arenaservers.grlogo.generic.x +
|
||||
(g_arenaservers.grlogo.width / 2);
|
||||
g_arenaservers.league.generic.y = g_arenaservers.grlogo.generic.y +
|
||||
g_arenaservers.grlogo.height + 2;
|
||||
g_arenaservers.league.string = leaguebuffer;
|
||||
g_arenaservers.league.style = UI_CENTER|UI_SMALLFONT;
|
||||
g_arenaservers.league.color = menu_text_color;
|
||||
|
||||
|
||||
g_arenaservers.practice.generic.type = MTYPE_TEXT;
|
||||
g_arenaservers.practice.generic.flags = QMF_HIDDEN;
|
||||
g_arenaservers.practice.generic.x = g_arenaservers.grlogo.generic.x +
|
||||
(g_arenaservers.grlogo.width / 2);
|
||||
g_arenaservers.practice.generic.y = g_arenaservers.grlogo.generic.y + 6;
|
||||
g_arenaservers.practice.string = "practice";
|
||||
g_arenaservers.practice.style = UI_CENTER|UI_SMALLFONT;
|
||||
g_arenaservers.practice.color = menu_text_color;
|
||||
|
||||
|
||||
y = 80;
|
||||
g_arenaservers.master.generic.type = MTYPE_SPINCONTROL;
|
||||
g_arenaservers.master.generic.name = "Servers:";
|
||||
|
|
@ -1550,10 +1512,6 @@ static void ArenaServers_MenuInit( void ) {
|
|||
Menu_AddItem( &g_arenaservers.menu, &g_arenaservers.modsm );
|
||||
Menu_AddItem( &g_arenaservers.menu, &g_arenaservers.exitm );
|
||||
|
||||
Menu_AddItem( &g_arenaservers.menu, (void*) &g_arenaservers.grlogo );
|
||||
Menu_AddItem( &g_arenaservers.menu, (void*) &g_arenaservers.league );
|
||||
Menu_AddItem( &g_arenaservers.menu, (void*) &g_arenaservers.practice );
|
||||
|
||||
Menu_AddItem( &g_arenaservers.menu, (void*) &g_arenaservers.master );
|
||||
Menu_AddItem( &g_arenaservers.menu, (void*) &g_arenaservers.gametype );
|
||||
Menu_AddItem( &g_arenaservers.menu, (void*) &g_arenaservers.sortkey );
|
||||
|
|
@ -1621,8 +1579,6 @@ void ArenaServers_Cache( void ) {
|
|||
trap_R_RegisterShaderNoMip( ART_ARROWS_UP );
|
||||
trap_R_RegisterShaderNoMip( ART_ARROWS_DOWN );
|
||||
trap_R_RegisterShaderNoMip( ART_UNKNOWNMAP );
|
||||
|
||||
trap_R_RegisterShaderNoMip( GLOBALRANKINGS_LOGO );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -312,6 +312,11 @@ static void UI_SPPostgameMenu_MenuDraw( void ) {
|
|||
if( postgameMenuInfo.phase == 2 ) {
|
||||
timer = uis.realtime - postgameMenuInfo.starttime;
|
||||
if( timer >= ( postgameMenuInfo.numAwards * AWARD_PRESENTATION_TIME ) ) {
|
||||
|
||||
if( timer < 5000 ) {
|
||||
return;
|
||||
}
|
||||
|
||||
postgameMenuInfo.phase = 3;
|
||||
postgameMenuInfo.starttime = uis.realtime;
|
||||
}
|
||||
|
|
@ -392,8 +397,8 @@ void UI_SPPostgameMenu_Cache( void ) {
|
|||
}
|
||||
|
||||
if( buildscript ) {
|
||||
trap_S_RegisterSound( "music music/loss.wav", qfalse );
|
||||
trap_S_RegisterSound( "music music/win.wav", qfalse );
|
||||
trap_S_RegisterSound( "music/loss.wav", qfalse );
|
||||
trap_S_RegisterSound( "music/win.wav", qfalse );
|
||||
trap_S_RegisterSound( "sound/player/announce/youwin.wav", qfalse );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ equ trap_PC_LoadSource -59
|
|||
equ trap_PC_FreeSource -60
|
||||
equ trap_PC_ReadToken -61
|
||||
equ trap_PC_SourceFileAndLine -62
|
||||
equ trap_S_StartBackgroundTrack -63
|
||||
equ trap_S_StopBackgroundTrack -64
|
||||
equ trap_S_StopBackgroundTrack -63
|
||||
equ trap_S_StartBackgroundTrack -64
|
||||
equ trap_RealTime -65
|
||||
equ trap_LAN_GetServerCount -66
|
||||
equ trap_LAN_GetServerAddressString -67
|
||||
|
|
@ -88,7 +88,6 @@ equ trap_LAN_ServerIsVisible -85
|
|||
equ trap_LAN_CompareServers -86
|
||||
|
||||
|
||||
|
||||
equ memset -101
|
||||
equ memcpy -102
|
||||
equ strncpy -103
|
||||
|
|
|
|||
|
|
@ -27,13 +27,14 @@ typedef struct
|
|||
|
||||
static teammain_t s_teammain;
|
||||
|
||||
static menuframework_s s_teammain_menu;
|
||||
static menuaction_s s_teammain_orders;
|
||||
static menuaction_s s_teammain_voice;
|
||||
static menuaction_s s_teammain_joinred;
|
||||
static menuaction_s s_teammain_joinblue;
|
||||
static menuaction_s s_teammain_joingame;
|
||||
static menuaction_s s_teammain_spectate;
|
||||
// bk001204 - unused
|
||||
//static menuframework_s s_teammain_menu;
|
||||
//static menuaction_s s_teammain_orders;
|
||||
//static menuaction_s s_teammain_voice;
|
||||
//static menuaction_s s_teammain_joinred;
|
||||
//static menuaction_s s_teammain_joinblue;
|
||||
//static menuaction_s s_teammain_joingame;
|
||||
//static menuaction_s s_teammain_spectate;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -295,6 +295,8 @@ static void UI_TeamOrdersMenu_BuildBotList( void ) {
|
|||
for( n = 0; n < numPlayers && teamOrdersMenuInfo.numBots < 9; n++ ) {
|
||||
trap_GetConfigString( CS_PLAYERS + n, info, MAX_INFO_STRING );
|
||||
|
||||
playerTeam = TEAM_SPECTATOR; // bk001204 = possible uninit use
|
||||
|
||||
if( n == cs.clientNum ) {
|
||||
playerTeam = *Info_ValueForKey( info, "t" );
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in a new issue