cleanup: clean boot sequence

[d2df-sdl.git] / src / game / g_console.pas

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 02beb87ee76fc14509f2d5253f9c666a59d70972..feef35d638ad944f7b4352d12f11d24a0daa440b 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -46,7 +46,8 @@ uses
     end;
 
 procedure g_Console_Init;
-procedure g_Console_SysInit;
+procedure g_Console_Initialize;
+procedure g_Console_Finalize;
 procedure g_Console_Update;
 procedure g_Console_Char (C: AnsiChar);
 procedure g_Console_Control (K: Word);
@@ -104,7 +105,6 @@ uses
   g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf;
 
 const
-  autoexecScript = 'autoexec.cfg';
   configComment = 'generated by doom2d, do not modify';
 
 type
@@ -944,7 +944,7 @@ begin
   end
 end;
 
-procedure g_Console_SysInit;
+procedure g_Console_Initialize;
   var a: Integer;
 begin
   gConsoleShow := False;
@@ -1158,10 +1158,17 @@ begin
 
   g_Console_ResetBinds;
   g_Console_ReadConfig(gConfigScript);
-  g_Console_ReadConfig(autoexecScript);
+//  g_Console_ReadConfig(autoexecScript);
+  g_Console_ReadConfig('autoexec.cfg');
+
   gParsingBinds := False;
 end;
 
+procedure g_Console_Finalize;
+begin
+
+end;
+
 procedure g_Console_Init;
 begin
   g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
@@ -1683,7 +1690,7 @@ end;
 
 procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
 begin
-  //e_LogWritefln('bind "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), cmd, key]);
+  // e_LogWritefln('bind "%s" "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), down, up, key]);
   ASSERT(key >= 0);
   ASSERT(key < e_MaxInputKeys);
   if key > 0 then
@@ -1928,6 +1935,7 @@ procedure g_Console_WriteConfig (filename: String);
   end;
 
 begin
+  // e_LogWritefln('g_Console_WriteConfig: %s', [filename]);
   AssignFile(f, filename);
   Rewrite(f);
   WriteLn(f, '// ' + configComment);