okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First batch of bug fixes reported and patched by Zack "ZTurtleMan" Middleton:

Browse source 
#4736
#4730
#4731
#4732
#4733
#4735
#4736
#4737
#4738
#4739
This commit is contained in:
Thilo Schulz 2010-08-29 17:32:54 +00:00
parent 392b246ee9
commit 83a3e2ae1b
6 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
code/q3_ui/ui_servers2.c
View file

@ -147,8 +147,8 @@ static char* gamenames[] = {
};
static char* netnames[] = {
"???",
"UDP",
"??? ",
"UDP ",
"UDP6",
NULL
};
@ -534,7 +534,7 @@ static void ArenaServers_UpdateMenu( void ) {
pingColor = S_COLOR_RED;
}
Com_sprintf( buff, MAX_LISTBOXWIDTH, "%-20.20s %-12.12s %2d/%2d %-8.8s %3s %s%3d " S_COLOR_YELLOW "%s",
Com_sprintf( buff, MAX_LISTBOXWIDTH, "%-20.20s %-12.12s %2d/%2d %-8.8s %4s%s%3d " S_COLOR_YELLOW "%s",
servernodeptr->hostname, servernodeptr->mapname, servernodeptr->numclients,
servernodeptr->maxclients, servernodeptr->gamename,
netnames[servernodeptr->nettype], pingColor, servernodeptr->pingtime, servernodeptr->bPB ? "Yes" : "No" );
@ -672,6 +672,9 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime )
}
*/
servernodeptr->nettype = atoi(Info_ValueForKey(info, "nettype"));
if (servernodeptr->nettype < 0 || servernodeptr->nettype >= ARRAY_LEN(netnames)) {
servernodeptr->nettype = 0;
}
s = Info_ValueForKey( info, "game");
i = atoi( Info_ValueForKey( info, "gametype") );

8
code/q3_ui/ui_startserver.c
View file

@ -766,13 +766,13 @@ static void ServerOptions_Start( void ) {
case GT_TEAM:
trap_Cvar_SetValue( "ui_team_fraglimit", fraglimit );
trap_Cvar_SetValue( "ui_team_timelimit", timelimit );
trap_Cvar_SetValue( "ui_team_friendlt", friendlyfire );
trap_Cvar_SetValue( "ui_team_friendly", friendlyfire );
break;
case GT_CTF:
trap_Cvar_SetValue( "ui_ctf_fraglimit", fraglimit );
trap_Cvar_SetValue( "ui_ctf_capturelimit", flaglimit );
trap_Cvar_SetValue( "ui_ctf_timelimit", timelimit );
trap_Cvar_SetValue( "ui_ctf_friendlt", friendlyfire );
trap_Cvar_SetValue( "ui_ctf_friendly", friendlyfire );
break;
}
@ -1239,7 +1239,7 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
memset( &s_serveroptions, 0 ,sizeof(serveroptions_t) );
s_serveroptions.multiplayer = multiplayer;
s_serveroptions.gametype = (int)Com_Clamp( 0, 5, trap_Cvar_VariableValue( "g_gameType" ) );
s_serveroptions.gametype = (int)Com_Clamp( 0, GT_MAX_GAME_TYPE - 1, trap_Cvar_VariableValue( "g_gameType" ) );
s_serveroptions.punkbuster.curvalue = Com_Clamp( 0, 1, trap_Cvar_VariableValue( "sv_punkbuster" ) );
ServerOptions_Cache();