diff options
Diffstat (limited to 'code/q3_ui')
| -rw-r--r-- | code/q3_ui/ui_splevel.c | 10 | ||||
| -rw-r--r-- | code/q3_ui/ui_startserver.c | 38 |
2 files changed, 24 insertions, 24 deletions
diff --git a/code/q3_ui/ui_splevel.c b/code/q3_ui/ui_splevel.c index 016d996..0c3b08f 100644 --- a/code/q3_ui/ui_splevel.c +++ b/code/q3_ui/ui_splevel.c @@ -198,11 +198,11 @@ static void UI_SPLevelMenu_SetBots( void ) { *p++ = 0; } - botInfo = UI_GetBotInfoByName( bot );
- if(!botInfo)
- {
- botInfo = UI_GetBotInfoByNumber( levelMenuInfo.numBots );
- }
+ botInfo = UI_GetBotInfoByName( bot ); + if(!botInfo) + { + botInfo = UI_GetBotInfoByNumber( levelMenuInfo.numBots ); + } if( botInfo ) { levelMenuInfo.botPics[levelMenuInfo.numBots] = PlayerIconHandle( Info_ValueForKey( botInfo, "model" ) ); diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c index c5745d1..b249e0f 100644 --- a/code/q3_ui/ui_startserver.c +++ b/code/q3_ui/ui_startserver.c @@ -50,7 +50,7 @@ START SERVER MENU ***** #define MAX_MAPROWS 2 #define MAX_MAPCOLS 2 #define MAX_MAPSPERPAGE 4 -
+ #define MAX_NAMELENGTH 16 #define ID_GAMETYPE 10 #define ID_PICTURES 11 // 12, 13, 14 @@ -161,21 +161,21 @@ StartServer_Update static void StartServer_Update( void ) { int i; int top; - static char picname[MAX_MAPSPERPAGE][64];
+ static char picname[MAX_MAPSPERPAGE][64]; const char *info; - char mapname[MAX_NAMELENGTH];
+ char mapname[MAX_NAMELENGTH]; top = s_startserver.page*MAX_MAPSPERPAGE; for (i=0; i<MAX_MAPSPERPAGE; i++) { if (top+i >= s_startserver.nummaps) - break;
+ break; info = UI_GetArenaInfoByNumber( s_startserver.maplist[ top + i ]); Q_strncpyz( mapname, Info_ValueForKey( info, "map"), MAX_NAMELENGTH ); Q_strupr( mapname ); -
+ Com_sprintf( picname[i], sizeof(picname[i]), "levelshots/%s", mapname ); s_startserver.mappics[i].generic.flags &= ~QMF_HIGHLIGHT; @@ -251,7 +251,7 @@ static void StartServer_GametypeEvent( void* ptr, int event ) { int gamebits; int matchbits; const char *info; -
+ if( event != QM_ACTIVATED) { return; } @@ -261,15 +261,15 @@ static void StartServer_GametypeEvent( void* ptr, int event ) { matchbits = 1 << gametype_remap[s_startserver.gametype.curvalue]; if( gametype_remap[s_startserver.gametype.curvalue] == GT_FFA ) { matchbits |= ( 1 << GT_SINGLE_PLAYER ); - }
+ } for( i = 0; i < count; i++ ) { - info = UI_GetArenaInfoByNumber( i );
+ info = UI_GetArenaInfoByNumber( i ); gamebits = GametypeBits( Info_ValueForKey( info, "type") ); if( !( gamebits & matchbits ) ) { continue; } -
+ s_startserver.maplist[ s_startserver.nummaps ] = i; s_startserver.nummaps++; } @@ -330,7 +330,7 @@ static void StartServer_LevelshotDraw( void *self ) { int w; int h; int n; - const char *info;
+ const char *info; b = (menubitmap_s *)self; @@ -364,7 +364,7 @@ static void StartServer_LevelshotDraw( void *self ) { x += b->width / 2; y += 4; n = s_startserver.page * MAX_MAPSPERPAGE + b->generic.id - ID_PICTURES; -
+ info = UI_GetArenaInfoByNumber( s_startserver.maplist[ n ]); UI_DrawString( x, y, Info_ValueForKey( info, "map" ), UI_CENTER|UI_SMALLFONT, color_orange ); @@ -559,7 +559,7 @@ void StartServer_Cache( void ) const char *info; qboolean precache; char picname[64]; - char mapname[ MAX_NAMELENGTH ];
+ char mapname[ MAX_NAMELENGTH ]; trap_R_RegisterShaderNoMip( GAMESERVER_BACK0 ); trap_R_RegisterShaderNoMip( GAMESERVER_BACK1 ); @@ -577,7 +577,7 @@ void StartServer_Cache( void ) precache = trap_Cvar_VariableValue("com_buildscript"); if( precache ) { - for( i = 0; i < UI_GetNumArenas(); i++ ) {
+ for( i = 0; i < UI_GetNumArenas(); i++ ) { info = UI_GetArenaInfoByNumber( i ); Q_strncpyz( mapname, Info_ValueForKey( info, "map"), MAX_NAMELENGTH ); Q_strupr( mapname ); @@ -1091,10 +1091,10 @@ static void ServerOptions_InitBotNames( void ) { *p++ = 0; } - botInfo = UI_GetBotInfoByName( bot );
- if( !botInfo )
- {
- botInfo = UI_GetBotInfoByNumber( count );
+ botInfo = UI_GetBotInfoByName( bot ); + if( !botInfo ) + { + botInfo = UI_GetBotInfoByNumber( count ); } bot = Info_ValueForKey( botInfo, "name" ); @@ -1127,8 +1127,8 @@ ServerOptions_SetMenuItems ================= */ static void ServerOptions_SetMenuItems( void ) { - static char picname[64];
- char mapname[MAX_NAMELENGTH];
+ static char picname[64]; + char mapname[MAX_NAMELENGTH]; const char *info; switch( s_serveroptions.gametype ) { |