X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=fee51960c149868ffe4c969c24c04e7c1513af66;hb=04a627f372ad5aa1faf4b4b04b3f400c6f37329f;hp=31bce9a1aa2ef7f026ce71cd57e55637a6373b19;hpb=844441154d1220d6c83f75043300c2851ec87109;p=d2df-sdl.git
diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 31bce9a..fee5196 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -1,77 +1,531 @@
+(* Copyright (C) Doom 2D: Forever Developers
+ *
+ * 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, 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *)
+{$INCLUDE ../shared/a_modes.inc}
unit g_console;
interface
-procedure g_Console_Init();
-procedure g_Console_Update();
-procedure g_Console_Draw();
-procedure g_Console_Switch();
-procedure g_Console_Char(C: Char);
-procedure g_Console_Control(K: Word);
-procedure g_Console_Process(L: String; Quiet: Boolean = False);
-procedure g_Console_Add(L: String; Show: Boolean = False);
-procedure g_Console_Clear();
-function g_Console_CommandBlacklisted(C: String): Boolean;
+uses
+ utils; // for SSArray
+
+ const
+ ACTION_JUMP = 0;
+ ACTION_MOVELEFT = 1;
+ ACTION_MOVERIGHT = 2;
+ ACTION_LOOKDOWN = 3;
+ ACTION_LOOKUP = 4;
+ ACTION_ATTACK = 5;
+ ACTION_SCORES = 6;
+ ACTION_ACTIVATE = 7;
+ ACTION_STRAFE = 8;
+
+ FIRST_ACTION = ACTION_JUMP;
+ LAST_ACTION = ACTION_STRAFE;
+
+ var (* private state *)
+ Line: AnsiString;
+ CPos: Word;
+ conSkipLines: Integer;
+ MsgArray: Array [0..4] of record
+ Msg: AnsiString;
+ Time: Word;
+ end;
-procedure g_Console_Chat_Switch(Team: Boolean = False);
+procedure g_Console_Init;
+procedure g_Console_Initialize;
+procedure g_Console_Finalize;
+procedure g_Console_Update;
+procedure g_Console_Char (C: AnsiChar);
+procedure g_Console_Control (K: Word);
+procedure g_Console_Process (L: AnsiString; quiet: Boolean=false);
+procedure g_Console_Add (L: AnsiString; show: Boolean=false);
+procedure g_Console_Clear;
+function g_Console_CommandBlacklisted (C: AnsiString): Boolean;
+procedure g_Console_ReadConfig (filename: String);
+procedure g_Console_WriteConfig (filename: String);
+procedure g_Console_WriteGameConfig;
+
+function g_Console_Interactive: Boolean;
+function g_Console_Action (action: Integer): Boolean;
+function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
+function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False);
+procedure g_Console_ProcessBind (key: Integer; down: Boolean);
+procedure g_Console_ProcessBindRepeat (key: Integer);
+procedure g_Console_ResetBinds;
+
+procedure conwriteln (const s: AnsiString; show: Boolean=false);
+procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean=false);
+
+procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+
+// <0: no arg; 0/1: true/false
+function conGetBoolArg (p: SSArray; idx: Integer): Integer;
+
+// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
+function conParseFloat (var res: Single; const s: AnsiString): Boolean;
+
+const
+ {$IFDEF HEADLESS}
+ defaultConfigScript = 'dfserver.cfg';
+ {$ELSE}
+ defaultConfigScript = 'dfconfig.cfg';
+ {$ENDIF}
var
- gConsoleShow: Boolean; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
- gChatShow: Boolean;
- gChatTeam: Boolean = False;
- gAllowConsoleMessages: Boolean = True;
- gChatEnter: Boolean = True;
- gJustChatted: Boolean = False; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
+ gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
+ gChatShow: Boolean = false;
+ gChatTeam: Boolean = false;
+ gAllowConsoleMessages: Boolean = true;
+ gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
+ gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
+ gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+ gConfigScript: string = defaultConfigScript;
implementation
uses
- g_textures, g_main, e_graphics, e_input, g_game,
- SysUtils, g_basic, g_options, wadreader, Math,
- g_menu, g_language, g_net, g_netmsg, e_log;
+ g_textures, e_input, g_game, g_gfx, g_player, g_items,
+ SysUtils, g_basic, g_options, Math, g_touch, e_res,
+ g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons,
+ Keyboard;
+
+const
+ configComment = 'generated by doom2d, do not modify';
type
- TCmdProc = procedure (P: SArray);
+ PCommand = ^TCommand;
+
+ TCmdProc = procedure (p: SSArray);
+ TCmdProcEx = procedure (me: PCommand; p: SSArray);
TCommand = record
- Cmd: String;
- Proc: TCmdProc;
+ cmd: AnsiString;
+ proc: TCmdProc;
+ procEx: TCmdProcEx;
+ help: AnsiString;
+ hidden: Boolean;
+ ptr: Pointer; // various data
+ msg: AnsiString; // message for var changes
+ cheat: Boolean;
+ action: Integer; // >= 0 for action commands
+ player: Integer; // used for action commands
end;
TAlias = record
- Name: String;
- Commands: SArray;
+ name: AnsiString;
+ commands: SSArray;
end;
+
const
- Step = 32;
- Alpha = 25;
MsgTime = 144;
MaxScriptRecursion = 16;
- DEBUG_STRING = 'DEBUG MODE';
-
var
- ID: DWORD;
RecursionDepth: Word = 0;
RecursionLimitHit: Boolean = False;
- Cons_Y: SmallInt;
- Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü?
- Line: String;
- CPos: Word;
- ConsoleHistory: SArray;
- CommandHistory: SArray;
- Whitelist: SArray;
- Commands: Array of TCommand;
- Aliases: Array of TAlias;
+ InputReady: Boolean; // allow text input in console/chat
+ //ConsoleHistory: SSArray;
+ CommandHistory: SSArray;
+ Whitelist: SSArray;
+ commands: Array of TCommand = nil;
+ Aliases: Array of TAlias = nil;
CmdIndex: Word;
- Offset: Word;
- MsgArray: Array [0..4] of record
- Msg: String;
- Time: Word;
- end;
-function GetStrACmd(var Str: String): String;
+ gInputBinds: Array [0..e_MaxInputKeys - 1] of record
+ rep: Boolean;
+ down, up: SSArray;
+ end;
+ menu_toggled: BOOLEAN; (* hack for menu controls *)
+ ConsoleStdIn: Boolean;
+
+procedure g_Console_Switch;
+begin
+ gChatShow := False;
+ gConsoleShow := not gConsoleShow;
+ InputReady := False;
+ g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+end;
+
+procedure g_Console_Chat_Switch (Team: Boolean = False);
+begin
+ if not g_Game_IsNet then Exit;
+ gConsoleShow := False;
+ gChatShow := not gChatShow;
+ gChatTeam := Team;
+ InputReady := False;
+ Line := '';
+ CPos := 1;
+ g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+end;
+
+// poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
+function conParseFloat (var res: Single; const s: AnsiString): Boolean;
+var
+ pos: Integer = 1;
+ frac: Single = 1;
+ slen: Integer;
+begin
+ result := false;
+ res := 0;
+ slen := Length(s);
+ while (slen > 0) and (s[slen] <= ' ') do Dec(slen);
+ while (pos <= slen) and (s[pos] <= ' ') do Inc(pos);
+ if (pos > slen) then exit;
+ if (slen-pos = 1) and (s[pos] = '.') then exit; // single dot
+ // integral part
+ while (pos <= slen) do
+ begin
+ if (s[pos] < '0') or (s[pos] > '9') then break;
+ res := res*10+Byte(s[pos])-48;
+ Inc(pos);
+ end;
+ if (pos <= slen) then
+ begin
+ // must be a dot
+ if (s[pos] <> '.') then exit;
+ Inc(pos);
+ while (pos <= slen) do
+ begin
+ if (s[pos] < '0') or (s[pos] > '9') then break;
+ frac := frac/10;
+ res += frac*(Byte(s[pos])-48);
+ Inc(pos);
+ end;
+ end;
+ if (pos <= slen) then exit; // oops
+ result := true;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+// <0: no arg; 0/1: true/false; 666: toggle
+function conGetBoolArg (p: SSArray; idx: Integer): Integer;
+begin
+ if (idx < 0) or (idx > High(p)) then begin result := -1; exit; end;
+ result := 0;
+ if (p[idx] = '1') or (CompareText(p[idx], 'on') = 0) or (CompareText(p[idx], 'true') = 0) or
+ (CompareText(p[idx], 'tan') = 0) or (CompareText(p[idx], 'yes') = 0) then result := 1
+ else if (CompareText(p[idx], 'toggle') = 0) or (CompareText(p[idx], 'switch') = 0) or
+ (CompareText(p[idx], 't') = 0) then result := 666;
+end;
+
+
+procedure boolVarHandler (me: PCommand; p: SSArray);
+ procedure binaryFlag (var flag: Boolean; msg: AnsiString);
+ var
+ old: Boolean;
+ begin
+ if (Length(p) > 2) then
+ begin
+ conwritefln('too many arguments to ''%s''', [p[0]]);
+ end
+ else
+ begin
+ old := flag;
+ case conGetBoolArg(p, 1) of
+ -1: begin end;
+ 0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
+ 1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
+ 666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
+ end;
+ if flag <> old then
+ g_Console_WriteGameConfig();
+ if (Length(msg) = 0) then msg := p[0] else msg += ':';
+ if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
+ end;
+ end;
+begin
+ binaryFlag(PBoolean(me.ptr)^, me.msg);
+end;
+
+
+procedure intVarHandler (me: PCommand; p: SSArray);
+var
+ old: Integer;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+ end
+ else
+ begin
+ try
+ old := PInteger(me.ptr)^;
+ PInteger(me.ptr)^ := StrToInt(p[1]);
+ if PInteger(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ except
+ conwritefln('invalid integer value: "%s"', [p[1]]);
+ end;
+ end;
+end;
+
+
+procedure wordVarHandler (me: PCommand; p: SSArray);
+var
+ old: Integer;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+ end
+ else
+ begin
+ try
+ old := PWord(me.ptr)^;
+ PWord(me.ptr)^ := min($FFFF, StrToDWord(p[1]));
+ if PWord(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ except
+ conwritefln('invalid word value: "%s"', [p[1]]);
+ end;
+ end;
+end;
+
+
+procedure dwordVarHandler (me: PCommand; p: SSArray);
+var
+ old: Integer;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+ end
+ else
+ begin
+ try
+ old := PCardinal(me.ptr)^;
+ PCardinal(me.ptr)^ := StrToDWord(p[1]);
+ if PCardinal(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ except
+ conwritefln('invalid dword value: "%s"', [p[1]]);
+ end;
+ end;
+end;
+
+
+procedure strVarHandler (me: PCommand; p: SSArray);
+var
+ old: AnsiString;
+begin
+ if (Length(p) <> 2) then
+ begin
+ conwritefln('%s %s', [me.cmd, QuoteStr(PAnsiString(me.ptr)^)]);
+ end
+ else
+ begin
+ old := PAnsiString(me.ptr)^;
+ PAnsiString(me.ptr)^ := p[1];
+ if PAnsiString(me.ptr)^ <> old then
+ g_Console_WriteGameConfig();
+ end;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+begin
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := boolVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+begin
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := intVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+begin
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := wordVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+begin
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := dwordVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+begin
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := strVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pvar;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+// ////////////////////////////////////////////////////////////////////////// //
+type
+ PVarSingle = ^TVarSingle;
+ TVarSingle = record
+ val: PSingle;
+ min, max, def: Single; // default will be starting value
+ end;
+
+
+procedure singleVarHandler (me: PCommand; p: SSArray);
+var
+ pv: PVarSingle;
+ nv, old: Single;
+ msg: AnsiString;
+begin
+ if (Length(p) > 2) then
+ begin
+ conwritefln('too many arguments to ''%s''', [me.cmd]);
+ exit;
+ end;
+ pv := PVarSingle(me.ptr);
+ old := pv.val^;
+ if (Length(p) = 2) then
+ begin
+ if me.cheat and (not conIsCheatsEnabled) then begin conwriteln('not available'); exit; end;
+ if (CompareText(p[1], 'default') = 0) or (CompareText(p[1], 'def') = 0) or
+ (CompareText(p[1], 'd') = 0) or (CompareText(p[1], 'off') = 0) or
+ (CompareText(p[1], 'ona') = 0) then
+ begin
+ pv.val^ := pv.def;
+ end
+ else
+ begin
+ if not conParseFloat(nv, p[1]) then
+ begin
+ conwritefln('%s: ''%s'' doesn''t look like a floating number', [me.cmd, p[1]]);
+ exit;
+ end;
+ if (nv < pv.min) then nv := pv.min;
+ if (nv > pv.max) then nv := pv.max;
+ pv.val^ := nv;
+ end;
+ end;
+ if pv.val^ <> old then
+ g_Console_WriteGameConfig();
+ msg := me.msg;
+ if (Length(msg) = 0) then msg := me.cmd else msg += ':';
+ conwritefln('%s %s', [msg, pv.val^]);
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+ f: Integer;
+ cp: PCommand;
+ pv: PVarSingle;
+begin
+ GetMem(pv, sizeof(TVarSingle));
+ pv.val := pvar;
+ pv.min := amin;
+ pv.max := amax;
+ pv.def := pvar^;
+ f := Length(commands);
+ SetLength(commands, f+1);
+ cp := @commands[f];
+ cp.cmd := LowerCase(conname);
+ cp.proc := nil;
+ cp.procEx := singleVarHandler;
+ cp.help := ahelp;
+ cp.hidden := ahidden;
+ cp.ptr := pv;
+ cp.msg := amsg;
+ cp.cheat := acheat;
+ cp.action := -1;
+ cp.player := -1;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function GetStrACmd(var Str: AnsiString): AnsiString;
var
a: Integer;
begin
@@ -86,7 +540,7 @@ begin
end;
end;
-function ParseAlias(Str: String): SArray;
+function ParseAlias(Str: AnsiString): SSArray;
begin
Result := nil;
@@ -102,18 +556,20 @@ begin
end;
end;
-procedure ConsoleCommands(P: SArray);
+procedure ConsoleCommands(p: SSArray);
var
- Cmd, s: String;
+ cmd, s: AnsiString;
a, b: Integer;
- F: TextFile;
+ (* F: TextFile; *)
begin
- Cmd := LowerCase(P[0]);
+ cmd := LowerCase(p[0]);
s := '';
- if Cmd = 'clear' then
+ if cmd = 'clear' then
begin
- ConsoleHistory := nil;
+ //ConsoleHistory := nil;
+ cbufClear();
+ conSkipLines := 0;
for a := 0 to High(MsgArray) do
with MsgArray[a] do
@@ -123,10 +579,10 @@ begin
end;
end;
- if Cmd = 'clearhistory' then
+ if cmd = 'clearhistory' then
CommandHistory := nil;
- if Cmd = 'showhistory' then
+ if cmd = 'showhistory' then
if CommandHistory <> nil then
begin
g_Console_Add('');
@@ -134,38 +590,48 @@ begin
g_Console_Add(' '+CommandHistory[a]);
end;
- if Cmd = 'commands' then
+ if cmd = 'commands' then
begin
g_Console_Add('');
- g_Console_Add('Commands list:');
- for a := High(Commands) downto 0 do
- g_Console_Add(' '+Commands[a].Cmd);
+ g_Console_Add('commands list:');
+ for a := High(commands) downto 0 do
+ begin
+ if (Length(commands[a].help) > 0) then
+ begin
+ g_Console_Add(' '+commands[a].cmd+' -- '+commands[a].help);
+ end
+ else
+ begin
+ g_Console_Add(' '+commands[a].cmd);
+ end;
+ end;
end;
- if Cmd = 'time' then
+ if cmd = 'time' then
g_Console_Add(TimeToStr(Now), True);
- if Cmd = 'date' then
+ if cmd = 'date' then
g_Console_Add(DateToStr(Now), True);
- if Cmd = 'echo' then
- if Length(P) > 1 then
+ if cmd = 'echo' then
+ if Length(p) > 1 then
begin
- if P[1] = 'ololo' then
+ if p[1] = 'ololo' then
gCheats := True
else
begin
s := '';
- for a := 1 to High(P) do
- s := s + P[a] + ' ';
+ for a := 1 to High(p) do
+ s := s + p[a] + ' ';
g_Console_Add(b_Text_Format(s), True);
end;
end
else
g_Console_Add('');
- if Cmd = 'dump' then
+ if cmd = 'dump' then
begin
+ (*
if ConsoleHistory <> nil then
begin
if Length(P) > 1 then
@@ -190,108 +656,89 @@ begin
g_Console_Add(Format(_lc[I_CONSOLE_DUMPED], [s]));
{$I+}
end;
+ *)
end;
- if Cmd = 'exec' then
+ if cmd = 'exec' then
begin
// exec
- if Length(P) > 1 then
- begin
- s := GameDir+'/'+P[1];
-
- {$I-}
- AssignFile(F, s);
- Reset(F);
- if IOResult <> 0 then
- begin
- g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
- CloseFile(F);
- Exit;
- end;
- g_Console_Add(Format(_lc[I_CONSOLE_EXEC], [s]));
-
- while not EOF(F) do
- begin
- ReadLn(F, s);
- if IOResult <> 0 then
- begin
- g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
- CloseFile(F);
- Exit;
- end;
- if Pos('#', s) <> 1 then // script comment
- begin
- // prevents endless loops
- Inc(RecursionDepth);
- RecursionLimitHit := (RecursionDepth > MaxScriptRecursion) or RecursionLimitHit;
- if not RecursionLimitHit then
- g_Console_Process(s, True);
- Dec(RecursionDepth);
- end;
- end;
- if (RecursionDepth = 0) and RecursionLimitHit then
- begin
- g_Console_Add(Format(_lc[I_CONSOLE_ERROR_CALL], [s]));
- RecursionLimitHit := False;
- end;
+ if Length(p) = 2 then
+ g_Console_ReadConfig(p[1])
+ else
+ g_Console_Add('exec