[quake3-commits] r2394 - trunk/code/game
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Dec 28 22:33:00 EST 2012
Author: ztm
Date: 2012-12-28 22:33:00 -0500 (Fri, 28 Dec 2012)
New Revision: 2394
Modified:
trunk/code/game/g_bot.c
trunk/code/game/g_main.c
Log:
Changes from Ensiform:
- In G_AddBot, try to allocate clientNum before doing anything else.
- In G_AddBot, don't set SVF_BOT and inuse. It's done in ClientConnect, plus inuse causes ClientDisconnect to be run for no reason.
- In G_AddBot, only set skill in bot useinfo once.
- Avoid using cl->ps.clientNum to check if cl is a bot.
Modified: trunk/code/game/g_bot.c
===================================================================
--- trunk/code/game/g_bot.c 2012-12-29 01:45:11 UTC (rev 2393)
+++ trunk/code/game/g_bot.c 2012-12-29 03:33:00 UTC (rev 2394)
@@ -248,7 +248,7 @@
if ( cl->pers.connected != CON_CONNECTED ) {
continue;
}
- if ( !(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT) ) {
+ if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
continue;
}
if ( team >= 0 && cl->sess.sessionTeam != team ) {
@@ -271,7 +271,7 @@
if ( cl->pers.connected != CON_CONNECTED ) {
continue;
}
- if ( !(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT) ) {
+ if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
continue;
}
if ( team >= 0 && cl->sess.sessionTeam != team ) {
@@ -312,13 +312,13 @@
if ( cl->pers.connected != CON_CONNECTED ) {
continue;
}
- if ( !(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT) ) {
+ if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
continue;
}
if ( team >= 0 && cl->sess.sessionTeam != team ) {
continue;
}
- trap_SendConsoleCommand( EXEC_INSERT, va("clientkick %d\n", cl->ps.clientNum) );
+ trap_SendConsoleCommand( EXEC_INSERT, va("clientkick %d\n", i) );
return qtrue;
}
return qfalse;
@@ -339,7 +339,7 @@
if ( cl->pers.connected != CON_CONNECTED ) {
continue;
}
- if ( g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT ) {
+ if ( g_entities[i].r.svFlags & SVF_BOT ) {
continue;
}
if ( team >= 0 && cl->sess.sessionTeam != team ) {
@@ -365,7 +365,7 @@
if ( cl->pers.connected != CON_CONNECTED ) {
continue;
}
- if ( !(g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT) ) {
+ if ( !(g_entities[i].r.svFlags & SVF_BOT) ) {
continue;
}
if ( team >= 0 && cl->sess.sessionTeam != team ) {
@@ -562,7 +562,6 @@
static void G_AddBot( const char *name, float skill, const char *team, int delay, char *altname) {
int clientNum;
char *botinfo;
- gentity_t *bot;
char *key;
char *s;
char *botname;
@@ -570,6 +569,14 @@
char *headmodel;
char userinfo[MAX_INFO_STRING];
+ // have the server allocate a client slot
+ clientNum = trap_BotAllocateClient();
+ if ( clientNum == -1 ) {
+ G_Printf( S_COLOR_RED "Unable to add bot. All player slots are in use.\n" );
+ G_Printf( S_COLOR_RED "Start server with more 'open' slots (or check setting of sv_maxclients cvar).\n" );
+ return;
+ }
+
// get the botinfo from bots.txt
botinfo = G_GetBotInfoByName( name );
if ( !botinfo ) {
@@ -591,7 +598,7 @@
Info_SetValueForKey( userinfo, "name", botname );
Info_SetValueForKey( userinfo, "rate", "25000" );
Info_SetValueForKey( userinfo, "snaps", "20" );
- Info_SetValueForKey( userinfo, "skill", va("%1.2f", skill) );
+ Info_SetValueForKey( userinfo, "skill", va("%5.2f", skill) );
if ( skill >= 1 && skill < 2 ) {
Info_SetValueForKey( userinfo, "handicap", "50" );
@@ -647,16 +654,8 @@
trap_Print( S_COLOR_RED "Error: bot has no aifile specified\n" );
return;
}
+ Info_SetValueForKey( userinfo, "characterfile", s );
- // have the server allocate a client slot
- clientNum = trap_BotAllocateClient();
- if ( clientNum == -1 ) {
- G_Printf( S_COLOR_RED "Unable to add bot. All player slots are in use.\n" );
- G_Printf( S_COLOR_RED "Start server with more 'open' slots (or check setting of sv_maxclients cvar).\n" );
- return;
- }
-
- // initialize the bot settings
if( !team || !*team ) {
if( g_gametype.integer >= GT_TEAM ) {
if( PickTeam(clientNum) == TEAM_RED) {
@@ -670,14 +669,8 @@
team = "red";
}
}
- Info_SetValueForKey( userinfo, "characterfile", Info_ValueForKey( botinfo, "aifile" ) );
- Info_SetValueForKey( userinfo, "skill", va( "%5.2f", skill ) );
Info_SetValueForKey( userinfo, "team", team );
- bot = &g_entities[ clientNum ];
- bot->r.svFlags |= SVF_BOT;
- bot->inuse = qtrue;
-
// register the userinfo
trap_SetUserinfo( clientNum, userinfo );
Modified: trunk/code/game/g_main.c
===================================================================
--- trunk/code/game/g_main.c 2012-12-29 01:45:11 UTC (rev 2393)
+++ trunk/code/game/g_main.c 2012-12-29 03:33:00 UTC (rev 2394)
@@ -1231,7 +1231,7 @@
if ( cl->pers.connected != CON_CONNECTED ) {
continue;
}
- if ( g_entities[cl->ps.clientNum].r.svFlags & SVF_BOT ) {
+ if ( g_entities[i].r.svFlags & SVF_BOT ) {
continue;
}
More information about the quake3-commits
mailing list