relaxed map reader, so "bloodlust", for example, is working now

[d2df-sdl.git] / src / engine / e_log.pas

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index 523c27f068de6ab6392058a12714edf8bda543ed..3a8d0adc2900ef25e1f3fb3ea896c54320504e3e 100644 (file)
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
@@ -31,6 +31,8 @@ type
 procedure e_InitLog (fFileName: String; fWriteMode: TWriteMode);
 procedure e_DeinitLog ();
 
+procedure e_SetSafeSlowLog (slowAndSafe: Boolean);
+
 procedure e_WriteLog (TextLine: String; RecordCategory: TRecordCategory; WriteTime: Boolean=True);
 
 function DecodeIPV4 (ip: LongWord): string;
@@ -66,54 +68,6 @@ procedure e_WriteLog (TextLine: String; RecordCategory: TRecordCategory; WriteTi
 begin
   e_LogWritefln('%s', [TextLine], RecordCategory, WriteTime);
 end;
-(*
-var
-  LogFile: TextFile;
-  Prefix: ShortString = '';
-  OutStr: String;
-begin
-  if driverInited and (length(TextLine) > 0) then
-  begin
-    case RecordCategory of
-      MSG_FATALERROR: write('FATAL: ');
-      MSG_WARNING: write('WARNING: ');
-    end;
-    writeln(TextLine);
-  end;
-
-  if FileName = '' then Exit;
-
-  Assign(LogFile, FileName);
-  try
-    if FileExists(FileName) then
-      Append(LogFile)
-    else
-      Rewrite(LogFile);
-    try
-      if FirstRecord then
-      begin
-        Writeln(LogFile, '--- Log started at '+TimeToStr(Time)+' ---');
-        FirstRecord := False;
-      end;
-      case RecordCategory of
-        MSG_FATALERROR: Prefix := '!!!';
-        MSG_WARNING:    Prefix := '!  ';
-        MSG_NOTIFY:     Prefix := '***';
-      end;
-      if WriteTime then
-        OutStr := '['+TimeToStr(Time)+'] '+Prefix+' '+TextLine
-      else
-        OutStr := Prefix+' '+TextLine;
-      Writeln(LogFile, OutStr);
-      if e_WriteToStdOut then
-        Writeln(OutStr);
-    finally
-      Close(LogFile);
-    end;
-  except // sorry
-  end;
-end;
-*)
 
 
 // returns formatted string if `writerCB` is `nil`, empty string otherwise
@@ -131,7 +85,7 @@ begin
   while (len > 0) do
   begin
     if (len > 255) then slen := 255 else slen := Integer(len);
-    Move(b^, ss[1], len);
+    Move(b^, ss[1], slen);
     ss[0] := AnsiChar(slen);
     write(ss);
     b += slen;
@@ -146,6 +100,19 @@ var
   xlogPrefix: AnsiString;
   xlogLastWasEOL: Boolean = false;
   xlogWantSpace: Boolean = false;
+  xlogSlowAndSafe: Boolean = false;
+
+
+procedure e_SetSafeSlowLog (slowAndSafe: Boolean);
+begin
+  xlogSlowAndSafe := slowAndSafe;
+  if xlogSlowAndSafe and xlogFileOpened then
+  begin
+    CloseFile(xlogFile);
+    xlogFileOpened := false;
+  end;
+end;
+
 
 procedure logwriter (constref buf; len: SizeUInt);
 var
@@ -164,12 +131,13 @@ begin
   while (len > 0) do
   begin
     slen := 0;
-    while (slen < len) and (slen < 255) and (b[slen] <> 13) and (b[slen] <> 10) do Inc(slen);
+    while (slen < len) and (b[slen] <> 13) and (b[slen] <> 10) do Inc(slen);
+    if (slen > 255) then slen := 255;
     // print string
     if (slen > 0) then
     begin
       if xlogWantSpace then begin write(xlogFile, ' '); xlogWantSpace := false; end;
-      Move(b^, ss[1], len);
+      Move(b^, ss[1], slen);
       ss[0] := AnsiChar(slen);
       write(xlogFile, ss);
       b += slen;
@@ -179,16 +147,8 @@ begin
     // process newline
     if (len > 0) and ((b[0] = 13) or (b[0] = 10)) then
     begin
-      if (len > 1) and (b[0] = 13) and (b[1] = 10) then
-      begin
-        len -= 2;
-        b += 2;
-      end
-      else
-      begin
-        len -= 1;
-        b += 1;
-      end;
+      if (b[0] = 13) then begin len -= 1; b += 1; end;
+      if (len > 0) and (b[0] = 10) then begin len -= 1; b += 1; end;
       xlogLastWasEOL := false;
       writeln(xlogFile, '');
       write(xlogFile, xlogPrefix);
@@ -247,6 +207,12 @@ begin
   formatstrf(fmt, args, logwriter);
   if not xlogLastWasEOL then writeln(xlogFile, '') else writeln(xlogFile, xlogPrefix);
 
+  if xlogSlowAndSafe and xlogFileOpened then
+  begin
+    CloseFile(xlogFile);
+    xlogFileOpened := false;
+  end;
+
   //if fopened then CloseFile(xlogFile);
 end;