Fix building for android

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

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index e2a88e08b66305dfebdc895eab2bfc17a40c9cdf..a1ca45c21e6da75c2948a2a4c99a32b5dc66103d 100644 (file)
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
@@ -40,7 +40,7 @@ function DecodeIPV4 (ip: LongWord): string;
 // start Write/WriteLn driver. it will write everything to cbuf.
 procedure e_InitWritelnDriver ();
 
-procedure e_LogWritefln (const fmt: AnsiString; args: array of const; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true);
+procedure e_LogWritefln (const fmt: AnsiString; args: array of const; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true; writeConsole: Boolean=true);
 procedure e_LogWriteln (const s: AnsiString; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true);
 
 
@@ -54,7 +54,10 @@ var
 implementation
 
 uses
-  SDL2, conbuf, utils;
+  {$IFDEF ANDROID}
+    SDL2,
+  {$ENDIF}
+  conbuf, utils;
 
 var
   FirstRecord: Boolean;
@@ -68,15 +71,24 @@ begin
 end;
 
 
+function consoleAllow (const s: String): Boolean;
+begin
+  Result := False;
+  if Pos('[Chat] ', s) = 1 then
+    Exit;
+  Result := True;
+end;
+
+
 procedure e_WriteLog (TextLine: String; RecordCategory: TMsgType; WriteTime: Boolean=True);
 begin
-  e_LogWritefln('%s', [TextLine], RecordCategory, WriteTime);
+  e_LogWritefln('%s', [TextLine], RecordCategory, WriteTime, consoleAllow(TextLine));
 end;
 
 
 procedure e_LogWriteln (const s: AnsiString; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true);
 begin
-  e_LogWritefln('%s', [s], category, writeTime);
+  e_LogWritefln('%s', [s], category, writeTime, consoleAllow(s));
 end;
 
 
@@ -99,8 +111,8 @@ begin
 {$IFDEF ANDROID}
   cstr := GetMem(len + 1);
   for slen := 0 to len - 1 do
-    cstr[slen] := Char(b[slen]);
-  cstr[slen + 1] := #0;
+    cstr[slen] := Chr(b[slen]);
+  cstr[len] := #0;
   SDL_Log(cstr, []);
   Dispose(cstr);
 {$ENDIF}
@@ -180,7 +192,7 @@ begin
 end;
 
 
-procedure e_LogWritefln (const fmt: AnsiString; args: array of const; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true);
+procedure e_LogWritefln (const fmt: AnsiString; args: array of const; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true; writeConsole: Boolean=true);
 
   procedure xwrite (const s: AnsiString);
   begin
@@ -189,7 +201,7 @@ procedure e_LogWritefln (const fmt: AnsiString; args: array of const; category:
   end;
 
 begin
-  if driverInited and (length(fmt) > 0) then
+  if driverInited and (length(fmt) > 0) and writeConsole then
   begin
     case category of
       TMsgType.Fatal: write('FATAL: ');