X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=fb76d519dfcef27660f37db6336f21f7fef7029c;hb=c7827dd408b445f025117f2c5df2a3c0f4622298;hp=47239783b94865e4625d9580479e87d3488c8f68;hpb=12a3a77053c645b50a8845a382daf8366fa0c2c0;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 4723978..fb76d51 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.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
@@ -38,6 +37,7 @@ uses
     LAST_ACTION = ACTION_WEAPPREV;
 
 procedure g_Console_Init;
+procedure g_Console_SysInit;
 procedure g_Console_Update;
 procedure g_Console_Draw (MessagesOnly: Boolean = False);
 procedure g_Console_Char (C: AnsiChar);
@@ -86,9 +86,13 @@ implementation
 
 uses
   g_textures, g_main, e_graphics, e_input, g_game,
-  SysUtils, g_basic, g_options, Math, g_touch,
+  SysUtils, g_basic, g_options, Math, g_touch, e_res,
   g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf;
 
+const
+  configScript = 'dfconfig.cfg';
+  autoexecScript = 'autoexec.cfg';
+  configComment = 'generated by doom2d, do not modify';
 
 type
   PCommand = ^TCommand;
@@ -289,7 +293,7 @@ var
 begin
   if (Length(p) <> 2) then
   begin
-    conwritefln('%s %s', [me.cmd, PAnsiString(me.ptr)^]);
+    conwritefln('%s %s', [me.cmd, QuoteStr(PAnsiString(me.ptr)^)]);
   end
   else
   begin
@@ -580,7 +584,7 @@ begin
   begin
     // exec <filename>
     if Length(p) = 2 then
-      g_Console_ReadConfig(GameDir + '/' + p[1])
+      g_Console_ReadConfig(p[1])
     else
       g_Console_Add('exec <script file>');
   end;
@@ -589,9 +593,14 @@ begin
   begin
     // writeconfig <filename>
     if Length(p) = 2 then
-      g_Console_WriteConfig(GameDir + '/' + p[1])
+    begin
+      s := e_GetWriteableDir(ConfigDirs);
+      g_Console_WriteConfig(e_CatPath(s, p[1]))
+    end
     else
-      g_Console_Add('writeconfig <file>');
+    begin
+      g_Console_Add('writeconfig <file>')
+    end
   end;
 
   if (cmd = 'ver') or (cmd = 'version') then
@@ -832,11 +841,9 @@ begin
   end
 end;
 
-procedure g_Console_Init();
-  var
-    a: Integer;
+procedure g_Console_SysInit;
+  var a: Integer;
 begin
-  g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
   Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
   gConsoleShow := False;
   gChatShow := False;
@@ -1017,10 +1024,14 @@ begin
   WhitelistCommand('g_timelimit');
 
   g_Console_ResetBinds;
-  g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
-  g_Console_ReadConfig(GameDir + '/autoexec.cfg');
+  g_Console_ReadConfig(configScript);
+  g_Console_ReadConfig(autoexecScript);
   gParsingBinds := False;
+end;
 
+procedure g_Console_Init;
+begin
+  g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
   g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
   g_Console_Add('');
 end;
@@ -1417,7 +1428,7 @@ begin
     IK_END, IK_KPEND:
       CPos := Length(Line) + 1;
     IK_A..IK_Z, IK_SPACE, IK_SHIFT, IK_RSHIFT, IK_CAPSLOCK, IK_LBRACKET, IK_RBRACKET,
-    IK_SEMICOLON, IK_QUOTE, IK_BACKSLASH, IK_SLASH, IK_COMMA, IK_DOT, IK_EQUALS,
+    IK_SEMICOLON, IK_QUOTE, IK_BACKSLASH, IK_SLASH, IK_COMMA, IK_DOT, (*IK_EQUALS,*)
     IK_0, IK_1, IK_2, IK_3, IK_4, IK_5, IK_6, IK_7, IK_8, IK_9, IK_MINUS, IK_EQUALS:
       (* see TEXTINPUT event *)
   end
@@ -1879,8 +1890,10 @@ end;
 procedure g_Console_ReadConfig (filename: String);
   var f: TextFile; s: AnsiString; i, len: Integer;
 begin
-  if FileExists(filename) then
+  e_LogWritefln('g_Console_ReadConfig (1) "%s"', [filename]);
+  if e_FindResource(ConfigDirs, filename, false) = true then
   begin
+    e_LogWritefln('g_Console_ReadConfig (2) "%s"', [filename]);
     AssignFile(f, filename);
     Reset(f);
     while not EOF(f) do
@@ -1906,7 +1919,7 @@ procedure g_Console_WriteConfig (filename: String);
 begin
   AssignFile(f, filename);
   Rewrite(f);
-  WriteLn(f, '// generated by doom2d, do not modify');
+  WriteLn(f, '// ' + configComment);
   WriteLn(f, 'unbindall');
   for i := 0 to e_MaxInputKeys - 1 do
     if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then
@@ -1935,16 +1948,26 @@ begin
       begin
         WriteLn(f, commands[i].cmd, ' ', PVarSingle(commands[i].ptr).val^:0:6)
       end
+      else if @commands[i].procEx = @strVarHandler then
+      begin
+        if Length(PAnsiString(commands[i].ptr)^) = 0 then
+          WriteLn(f, commands[i].cmd, ' ""')
+        else
+          WriteLn(f, commands[i].cmd, ' ', QuoteStr(PAnsiString(commands[i].ptr)^))
+      end
     end
   end;
   CloseFile(f)
 end;
 
 procedure g_Console_WriteGameConfig;
+  var s: AnsiString;
 begin
-  if gParsingBinds then
-    Exit;
-  g_Console_WriteConfig(GameDir + '/dfconfig.cfg');
+  if gParsingBinds = false then
+  begin
+    s := e_GetWriteableDir(ConfigDirs);
+    g_Console_WriteConfig(e_CatPath(s, configScript))
+  end
 end;
 
 initialization