diff --git a/src/engine/e_log.pas b/src/engine/e_log.pas
index b934a57d322936773b1e22a76ed5ba74aae739ff..0dcb0986b57df31edeef14c6a45b778012daa197 100644 (file)
--- a/src/engine/e_log.pas
+++ b/src/engine/e_log.pas
*
* 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
*
* 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
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
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 ();
procedure e_InitLog (fFileName: String; fWriteMode: TWriteMode);
procedure e_DeinitLog ();
// start Write/WriteLn driver. it will write everything to cbuf.
procedure e_InitWritelnDriver ();
// 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_LogWriteln (const s: AnsiString; category: TMsgType=TMsgType.Notify; writeTime: Boolean=true);
-
procedure e_WriteStackTrace (const msg: AnsiString);
procedure e_WriteStackTrace (const msg: AnsiString);
-
-var
- e_WriteToStdOut: Boolean = False;
-
-
implementation
uses
implementation
uses
+ {$IFDEF ANDROID}
+ SDL2,
+ {$ENDIF}
conbuf, utils;
var
conbuf, utils;
var
driverInited: Boolean = false;
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 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
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
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;
end;
ss: ShortString;
slen: Integer;
b: PByte;
ss: ShortString;
slen: Integer;
b: PByte;
+{$IFDEF ANDROID}
+ cstr: PChar;
+{$ENDIF}
begin
if (len < 1) then exit;
b := PByte(@buf);
begin
if (len < 1) then exit;
b := PByte(@buf);
+
+{$IFDEF ANDROID}
+ cstr := GetMem(len + 1);
+ for slen := 0 to len - 1 do
+ cstr[slen] := Chr(b[slen]);
+ cstr[len] := #0;
+ SDL_Log(cstr, []);
+ Dispose(cstr);
+{$ENDIF}
+
while (len > 0) do
begin
if (len > 255) then slen := 255 else slen := Integer(len);
while (len > 0) do
begin
if (len > 255) then slen := 255 else slen := Integer(len);
end;
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
procedure xwrite (const s: AnsiString);
begin
end;
begin
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: ');
begin
case category of
TMsgType.Fatal: write('FATAL: ');