ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bot loading in case player supplied invalid bot names

This commit is contained in:
Thilo Schulz 2009-10-06 14:17:12 +00:00
parent de9cf465cc
commit 549f23bda6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/q3_ui/ui_splevel.c
View File

@ -198,7 +198,12 @@ static void UI_SPLevelMenu_SetBots( void ) {
*p++ = 0; *p++ = 0;
} }
botInfo = UI_GetBotInfoByName( bot ); botInfo = UI_GetBotInfoByName( bot );
if(!botInfo)
{
botInfo = UI_GetBotInfoByNumber( levelMenuInfo.numBots );
}
if( botInfo ) { if( botInfo ) {
levelMenuInfo.botPics[levelMenuInfo.numBots] = PlayerIconHandle( Info_ValueForKey( botInfo, "model" ) ); levelMenuInfo.botPics[levelMenuInfo.numBots] = PlayerIconHandle( Info_ValueForKey( botInfo, "model" ) );
Q_strncpyz( levelMenuInfo.botNames[levelMenuInfo.numBots], Info_ValueForKey( botInfo, "name" ), 10 ); Q_strncpyz( levelMenuInfo.botNames[levelMenuInfo.numBots], Info_ValueForKey( botInfo, "name" ), 10 );

6
code/q3_ui/ui_startserver.c
View File

@ -1092,7 +1092,11 @@ static void ServerOptions_InitBotNames( void ) {
*p++ = 0; *p++ = 0;
} }
botInfo = UI_GetBotInfoByName( bot ); botInfo = UI_GetBotInfoByName( bot );
if( !botInfo )
{
botInfo = UI_GetBotInfoByNumber( count );
}
bot = Info_ValueForKey( botInfo, "name" ); bot = Info_ValueForKey( botInfo, "name" );
Q_strncpyz( s_serveroptions.playerNameBuffers[count], bot, sizeof(s_serveroptions.playerNameBuffers[count]) ); Q_strncpyz( s_serveroptions.playerNameBuffers[count], bot, sizeof(s_serveroptions.playerNameBuffers[count]) );