Update of /cvsroot/moeng/BBRpg/src/shared
In directory sc8-pr-cvs1:/tmp/cvs-serv20640/src/shared
Modified Files:
console.cpp console.h
Log Message:
Merged bbrpg branch.
Index: console.cpp
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/shared/console.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** console.cpp 9 Dec 2003 01:03:34 -0000 1.1
--- console.cpp 13 Jan 2004 16:32:35 -0000 1.2
***************
*** 35,38 ****
--- 35,39 ----
progress = 0;
active = false;
+ enableLogfile = true;
}
***************
*** 108,126 ****
time(&t);
! logFile = fopen(logFilename, "a");
! fprintf(
! logFile,
! "[%s%d:%s%d:%s%d] ",
! (((t / 60) / 60) % 24 < 10) ? "0" : "",
! (int)(((t / 60) / 60) % 24),
! ((t / 60) % 60 < 10) ? "0" : "",
! (int)((t / 60) % 60),
! (t % 60 < 10) ? "0" : "",
! (int)(t % 60)
! );
! fprintf(logFile, buf);
! fprintf(logFile, "\n");
if (where & CON_QUIT)
{
fprintf(logFile, "FATAL ERROR!\n");
fclose(logFile);
--- 109,132 ----
time(&t);
! if (enableLogfile) {
! logFile = fopen(logFilename, "a");
! fprintf(
! logFile,
! "[%s%d:%s%d:%s%d] ",
! (((t / 60) / 60) % 24 < 10) ? "0" : "",
! (int)(((t / 60) / 60) % 24),
! ((t / 60) % 60 < 10) ? "0" : "",
! (int)((t / 60) % 60),
! (t % 60 < 10) ? "0" : "",
! (int)(t % 60)
! );
! fprintf(logFile, buf);
! fprintf(logFile, "\n");
! fclose(logFile);
! }
!
if (where & CON_QUIT)
{
+ logFile = fopen(logFilename, "a");
fprintf(logFile, "FATAL ERROR!\n");
fclose(logFile);
***************
*** 129,133 ****
exit(1);
}
- fclose(logFile);
}
--- 135,138 ----
Index: console.h
===================================================================
RCS file: /cvsroot/moeng/BBRpg/src/shared/console.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** console.h 9 Dec 2003 01:03:34 -0000 1.1
--- console.h 13 Jan 2004 16:32:35 -0000 1.2
***************
*** 39,42 ****
--- 39,44 ----
void log(int where, int when, const char* what, ...);
+ bool enableLogfile;
+
private:
FILE* logFile;
|
