X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fengine%2Fe_log.pas;h=0dcb0986b57df31edeef14c6a45b778012daa197;hb=fbb649f409620a55ae48f1bffd655c5a04489371;hp=22db6527781c00ec9d8301d13e2b705a5365c7e4;hpb=1b5401f0727c171cf02d4484624bb3198f7a10bd;p=d2df-sdl.git

diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index 22db652..0dcb098 100644
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,13 +19,14 @@ unit e_log;
 
 interface
 
-uses
-  SysUtils;
+  uses SysUtils;
 
-type
-  TWriteMode = (WM_NEWFILE,  WM_OLDFILE);
-  TMsgType = (Fatal, Warning, Notify);
+  type
+    TWriteMode = (WM_NEWFILE,  WM_OLDFILE);
+    TMsgType = (Fatal, Warning, Notify);
 
+  procedure e_Log_Initialize;
+  procedure e_Log_Finalize;
 
 procedure e_InitLog (fFileName: String; fWriteMode: TWriteMode);
 procedure e_DeinitLog ();
@@ -40,21 +40,18 @@ 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);
 
-
 procedure e_WriteStackTrace (const msg: AnsiString);
 
-
-var
-  e_WriteToStdOut: Boolean = False;
-
-
 implementation
 
 uses
-  SDL2, conbuf, utils;
+  {$IFDEF ANDROID}
+    SDL2,
+  {$ENDIF}
+  conbuf, utils;
 
 var
   FirstRecord: Boolean;
@@ -62,21 +59,40 @@ var
   driverInited: Boolean = false;
 
 
+  procedure e_Log_Initialize;
+  begin
+  end;
+
+  procedure e_Log_Finalize;
+  begin
+    e_DeinitLog
+  end;
+
+
 function DecodeIPV4 (ip: LongWord): string;
 begin
   Result := Format('%d.%d.%d.%d', [ip and $FF, (ip shr 8) and $FF, (ip shr 16) and $FF, (ip shr 24)]);
 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;
 
 
@@ -180,7 +196,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 +205,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: ');