r715 - in trunk/code: botlib game qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2006-04-21 13:04:21 -0400 (Fri, 21 Apr 2006)
New Revision: 715

Modified:
   trunk/code/botlib/be_interface.c
   trunk/code/game/ai_main.c
   trunk/code/qcommon/common.c
Log:
- botlib logfile now gets stored in the fs_game directory in fs_homepath. (patch from Erik Auerswald)
- Added proper error handling when fopening qconsole.log
- Fixed bug where r_chat.c gets loaded in botlib even when bot_nochat is 1.



Modified: trunk/code/botlib/be_interface.c
===================================================================
--- trunk/code/botlib/be_interface.c	2006-04-20 16:52:39 UTC (rev 714)
+++ trunk/code/botlib/be_interface.c	2006-04-21 17:04:21 UTC (rev 715)
@@ -137,12 +137,24 @@
 {
 	int		errnum;
 	char		logfilename[MAX_QPATH];
+	char		*homedir, *gamedir;
 	
 	bot_developer = LibVarGetValue("bot_developer");
   memset( &botlibglobals, 0, sizeof(botlibglobals) ); // bk001207 - init
 	//initialize byte swapping (litte endian etc.)
 //	Swap_Init();
-	Com_sprintf(logfilename, sizeof(logfilename), "%s%cbotlib.log", LibVarGetString("homedir"), PATH_SEP);
+	homedir = LibVarGetString("homedir");
+	gamedir = LibVarGetString("gamedir");
+	if (homedir[0]) {
+		if (gamedir[0]) {
+			Com_sprintf(logfilename, sizeof(logfilename), "%s%c%s%cbotlib.log", homedir, PATH_SEP, gamedir, PATH_SEP);
+		}
+		else {
+			Com_sprintf(logfilename, sizeof(logfilename), "%s%cbaseq3%cbotlib.log", homedir, PATH_SEP, PATH_SEP);
+		}
+	} else {
+		Com_sprintf(logfilename, sizeof(logfilename), "botlib.log");
+	}
 	Log_Open(logfilename);
 	//
 	botimport.Print(PRT_MESSAGE, "------- BotLib Initialization -------\n");

Modified: trunk/code/game/ai_main.c
===================================================================
--- trunk/code/game/ai_main.c	2006-04-20 16:52:39 UTC (rev 714)
+++ trunk/code/game/ai_main.c	2006-04-21 17:04:21 UTC (rev 715)
@@ -1593,10 +1593,11 @@
 	trap_BotLibVarSet("g_gametype", buf);
 	//bot developer mode and log file
 	trap_BotLibVarSet("bot_developer", bot_developer.string);
+	trap_Cvar_VariableStringBuffer("logfile", buf, sizeof(buf));
 	trap_BotLibVarSet("log", buf);
 	//no chatting
 	trap_Cvar_VariableStringBuffer("bot_nochat", buf, sizeof(buf));
-	if (strlen(buf)) trap_BotLibVarSet("nochat", "0");
+	if (strlen(buf)) trap_BotLibVarSet("nochat", buf);
 	//visualize jump pads
 	trap_Cvar_VariableStringBuffer("bot_visualizejumppads", buf, sizeof(buf));
 	if (strlen(buf)) trap_BotLibVarSet("bot_visualizejumppads", buf);

Modified: trunk/code/qcommon/common.c
===================================================================
--- trunk/code/qcommon/common.c	2006-04-20 16:52:39 UTC (rev 714)
+++ trunk/code/qcommon/common.c	2006-04-21 17:04:21 UTC (rev 715)
@@ -181,12 +181,23 @@
 			newtime = localtime( &aclock );
 
 			logfile = FS_FOpenFileWrite( "qconsole.log" );
-			Com_Printf( "logfile opened on %s\n", asctime( newtime ) );
-			if ( com_logfile->integer > 1 ) {
-				// force it to not buffer so we get valid
-				// data even if we are crashing
-				FS_ForceFlush(logfile);
+			
+			if(logfile)
+			{
+				Com_Printf( "logfile opened on %s\n", asctime( newtime ) );
+			
+				if ( com_logfile->integer > 1 )
+				{
+					// force it to not buffer so we get valid
+					// data even if we are crashing
+					FS_ForceFlush(logfile);
+				}
 			}
+			else
+			{
+				Com_Printf("Opening qconsole.log failed!\n");
+				Cvar_SetValue("logfile", 0);
+			}
 
       opening_qconsole = qfalse;
 		}