X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=165a116c0446e72a44817b3abc61e9e116174fa9;hb=82d89552dd0e3241987ce363b71e83c22be306e1;hp=b5a22840fbda68d7b604cb420dd1e351f07f0fb2;hpb=dcddacd6f339e310c23663bd7e0b6ec7733ccf0f;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index b5a2284..165a116 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -1,9 +1,8 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* 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, 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
@@ -18,6 +17,8 @@ unit g_main;
 
 interface
 
+  uses Utils;
+
 procedure Main ();
 procedure Init ();
 procedure Release ();
@@ -27,83 +28,483 @@ procedure KeyPress (K: Word);
 procedure CharPress (C: AnsiChar);
 
 var
-  GameDir: string;
-  DataDir: string;
-  MapsDir: string;
-  ModelsDir: string;
-  GameWAD: string;
+  {--- TO REMOVE ---}
+  //GameDir: string;
+  {-----------------}
 
+  {--- Read-only dirs ---}
+  GameWAD: string;
+  DataDirs: SSArray;
+  ModelDirs: SSArray;
+  MegawadDirs: SSArray;
+  MapDirs: SSArray;
+  WadDirs: SSArray;
+  AllMapDirs: SSArray; // Maps + Megawads
+
+  {--- Read-Write dirs ---}
+  LogFileName: string;
+  LogDirs: SSArray;
+  SaveDirs: SSArray;
+  CacheDirs: SSArray;
+  ConfigDirs: SSArray;
+  ScreenshotDirs: SSArray;
+  MapDownloadDirs: SSArray;
+  WadDownloadDirs: SSArray;
 
 implementation
 
 uses
-  SDL2, GL, GLExt, wadreader, e_log, g_window,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+  g_holmes, sdlcarcass, fui_ctls, fui_wadread, fui_style, fui_gfx_gl,
+{$ENDIF}
+{$IFDEF LINUX}
+  BaseUnix,
+{$ENDIF}
+{$IFDEF DARWIN}
+  MacOSAll, CocoaAll,
+{$ENDIF}
+{$IFDEF USE_SDL2}
+  SDL2,
+{$ENDIF}
+  wadreader, e_log, g_window,
   e_graphics, e_input, g_game, g_console, g_gui,
-  e_sound, g_options, g_sound, g_player,
-  g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
-  g_menu, g_language, g_net, g_holmes,
-  utils, conbuf, envvars, fui_wadread, fui_style,
-  fui_gfx_gl, xparser;
+  e_sound, g_options, g_sound, g_player, g_basic,
+  g_weapons, SysUtils, g_triggers, MAPDEF, g_map, e_res,
+  g_menu, g_language, g_net, g_touch, g_system, g_res_downloader,
+  conbuf, envvars,
+  xparser;
 
 
 var
   charbuff: packed array [0..15] of AnsiChar;
+  binPath: AnsiString = '';
+  forceCurrentDir: Boolean = false;
 
-procedure Main();
+
+function GetBinaryPath (): AnsiString;
+{$IFDEF LINUX}
 var
-  sdlflags: LongWord;
-{$IFNDEF HEADLESS}
-  flexloaded: Boolean;
+  //cd: AnsiString;
+  sl: AnsiString;
 {$ENDIF}
 begin
-  e_InitWritelnDriver();
-
-  GetDir(0, GameDir);
-  MapsDir := GameDir + '/maps/';
-  DataDir := GameDir + '/data/';
-  ModelsDir := DataDir + 'models/';
-  GameWAD := DataDir + 'Game.wad';
+  result := ExtractFilePath(ParamStr(0));
+  {$IFDEF LINUX}
+  // it may be a symlink; do some guesswork here
+  sl := fpReadLink(ExtractFileName(ParamStr(0)));
+  if (sl = ParamStr(0)) then
+  begin
+    // use current directory, as we don't have anything better
+    //result := '.';
+    GetDir(0, result);
+  end;
+  {$ENDIF}
+  result := fixSlashes(result);
+  if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/';
+end;
 
-  e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
+procedure PrintDirs (msg: AnsiString; dirs: SSArray);
+  var dir: AnsiString;
+begin
+  e_LogWriteln(msg + ':');
+  for dir in dirs do
+    e_LogWriteln('  ' + dir);
+end;
 
-  e_WriteLog('Read config file', TMsgType.Notify);
-  g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+{$IFDEF DARWIN}
+  function NSStringToAnsiString (s: NSString): AnsiString;
+    var i: Integer;
+  begin
+    result := '';
+    for i := 0 to s.length - 1 do
+      result := result + AnsiChar(s.characterAtIndex(i));
+  end;
 
-{$IFDEF HEADLESS}
-  conbufDumpToStdOut := true;
+  function GetBundlePath (): AnsiString;
+    var pathRef: CFURLRef; pathCFStr: CFStringRef; pathStr: ShortString;
+  begin
+    pathRef := CFBundleCopyBundleURL(CFBundleGetMainBundle());
+    pathCFStr := CFURLCopyFileSystemPath(pathRef, kCFURLPOSIXPathStyle);
+    CFStringGetPascalString(pathCFStr, @pathStr, 255, CFStringGetSystemEncoding());
+    CFRelease(pathRef);
+    CFRelease(pathCFStr);
+    Result := pathStr;
+  end;
 {$ENDIF}
-  e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
 
-  //GetSystemDefaultLCID()
+procedure InitPath;
+  var i: Integer; rwdir, rodir: AnsiString; rwdirs, rodirs: SSArray;
+  //first: Boolean = true;
 
-  //e_WriteLog('Read language file', MSG_NOTIFY);
-  //g_Language_Load(DataDir + gLanguage + '.txt');
-  e_WriteLog(gLanguage, TMsgType.Notify);
-  g_Language_Set(gLanguage);
+  procedure xput (s: AnsiString);
+  {
+  var
+    f: TextFile;
+  begin
+    AssignFile(f, 'zzz.log');
+    if (first) then
+    begin
+      Rewrite(f);
+      first := false;
+    end
+    else
+    begin
+      Append(f);
+    end;
+    writeln(f, s);
+    CloseFile(f);
+  end;
+  }
+  begin
+  end;
 
-{$IFDEF HEADLESS}
- {$IFDEF USE_SDLMIXER}
-  sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
-  // HACK: shit this into env and hope for the best
-  SetEnvVar('SDL_AUDIODRIVER', 'dummy');
- {$ELSE}
-  sdlflags := SDL_INIT_TIMER or $00004000;
- {$ENDIF}
-{$ELSE}
- {$IFDEF USE_SDLMIXER}
-  sdlflags := SDL_INIT_EVERYTHING;
- {$ELSE}
-  sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
- {$ENDIF}
-{$ENDIF}
-  if SDL_Init(sdlflags) < 0 then
-    raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
+  procedure AddPath (var arr: SSArray; str: AnsiString; usecwd: Boolean=true);
+  var
+    ss: ShortString;
+  begin
+    if (length(str) = 0) then exit;
+    //writeln('NEW PATH(0): ['+str+']');
+    if (forceCurrentDir or usecwd) then
+    begin
+      str := fixSlashes(ExpandFileName(str));
+    end
+    else
+    begin
+      str := fixSlashes(str);
+      if (not isAbsolutePath(str)) then str := binPath+str;
+      while (length(str) > 0) do
+      begin
+        if (isRootPath(str)) then exit;
+        if (str[length(str)] = '/') then begin Delete(str, length(str), 1); continue; end;
+        if (length(str) >= 2) and (Copy(str, length(str)-1, 2) = '/.') then begin Delete(str, length(str)-1, 2); continue; end;
+        break;
+      end;
+    end;
+    if (length(str) = 0) then exit;
+    if (length(str) > 255) then
+    begin
+      xput('path too long: ['+str+']');
+      raise Exception.Create(Format('path "%s" too long', [str]));
+    end;
+    for ss in arr do
+    begin
+      //writeln('<<<', ss, '>>> : [', str, ']');
+      if (ss = str) then exit;
+    end;
+    SetLength(arr, Length(arr)+1);
+    //arr[High(arr)] := ExpandFileName(str);
+    arr[High(arr)] := str;
+    //writeln('NEW PATH(1): ['+str+']');
+  end;
 
-{$IFNDEF HEADLESS}
-  SDL_StartTextInput();
+  procedure AddDef (var dirs: SSArray; base: SSArray; append: AnsiString);
+    var s: AnsiString;
+  begin
+    if Length(dirs) = 0 then
+      for s in base do
+        AddPath(dirs, e_CatPath(s, append), false)
+  end;
+
+  procedure AddDir (var dirs: SSArray; append: AnsiString);
+  begin
+    SetLength(dirs, Length(dirs) + 1);
+    dirs[High(dirs)] := append
+  end;
+
+  function GetDefaultRODirs (): SSArray;
+    {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)}
+      var home: AnsiString;
+    {$ENDIF}
+    {$IFDEF WINDOWS}
+      var appdata: AnsiString;
+    {$ENDIF}
+    {$IFDEF DARWIN}
+      var bundle, s: AnsiString; dirArr: NSArray; i: Integer;
+    {$ENDIF}
+  begin
+    result := nil;
+    if forceCurrentDir = false then
+    begin
+      {$IFDEF USE_SDL2}
+        AddDir(result, SDL_GetBasePath());
+        AddDir(result, SDL_GetPrefPath('', 'doom2df'));
+      {$ENDIF}
+      {$IFDEF WINDOWS}
+        appdata := GetEnvironmentVariable('APPDATA') + '\doom2df';
+        if appdata <> '' then
+          AddDir(result, appdata);
+      {$ENDIF}
+      {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)}
+        AddDir(result, '/usr/share/doom2df');
+        AddDir(result, '/usr/local/share/doom2df');
+        home := GetEnvironmentVariable('HOME');
+        if home <> '' then
+          AddDir(result, e_CatPath(home, '.doom2df'));
+      {$ENDIF}
+      {$IFDEF DARWIN}
+        bundle := GetBundlePath();
+        if bundle <> '' then
+          AddDir(result, e_CatPath(bundle, 'Contents/Resources'));
+        dirArr := NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true);
+        for i := 0 to dirArr.count - 1 do
+        begin
+          s := NSStringToAnsiString(dirArr.objectAtIndex(i));
+          AddDir(result, e_CatPath(s, 'Doom 2D Forever'))
+        end;
+      {$ENDIF}
+      {$IF DEFINED(ANDROID) AND DEFINED(USE_SDL2)}
+        AddDir(result, SDL_AndroidGetInternalStoragePath());
+        if SDL_AndroidGetExternalStorageState() <> 0 then
+          AddDir(result, SDL_AndroidGetExternalStoragePath());
+      {$ENDIF}
+    end;
+    {$IFNDEF ANDROID}
+      {$IFDEF DARWIN}
+        if ExtractFileExt(bundle) <> '.app' then
+          AddDir(result, '');
+      {$ELSE}
+        AddDir(result, '');
+      {$ENDIF}
+    {$ENDIF}
+  end;
+
+  function GetDefaultRWDirs (): SSArray;
+    {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)}
+      var home: AnsiString;
+    {$ENDIF}
+    {$IFDEF WINDOWS}
+      var appdata: AnsiString;
+    {$ENDIF}
+    {$IFDEF DARWIN}
+      var bundle, s: AnsiString; dirArr: NSArray; i: Integer;
+    {$ENDIF}
+  begin
+    result := nil;
+    if forceCurrentDir = false then
+    begin
+      {$IFDEF USE_SDL2}
+        AddDir(result, SDL_GetPrefPath('', 'doom2df'));
+      {$ENDIF}
+      {$IFDEF WINDOWS}
+        appdata := GetEnvironmentVariable('APPDATA') + '\doom2df';
+        if appdata <> '' then
+          AddDir(result, appdata);
+      {$ENDIF}
+      {$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN) AND NOT DEFINED(ANDROID)}
+        home := GetEnvironmentVariable('HOME');
+        if home <> '' then
+          AddDir(result, e_CatPath(home, '.doom2df'));
+      {$ENDIF}
+      {$IFDEF DARWIN}
+        dirArr := NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true);
+        for i := 0 to dirArr.count - 1 do
+        begin
+          s := NSStringToAnsiString(dirArr.objectAtIndex(i));
+          AddDir(result, e_CatPath(s, 'Doom 2D Forever'))
+        end;
+      {$ENDIF}
+      {$IF DEFINED(ANDROID) AND DEFINED(USE_SDL2)}
+        if SDL_AndroidGetExternalStorageState() <> 0 then
+          AddDir(result, SDL_AndroidGetExternalStoragePath());
+      {$ENDIF}
+    end;
+    {$IFNDEF ANDROID}
+      {$IFDEF DARWIN}
+        bundle := GetBundlePath();
+        if ExtractFileExt(bundle) <> '.app' then
+        if bundle = '' then
+          AddDir(result, '');
+      {$ELSE}
+        AddDir(result, '');
+      {$ENDIF}
+    {$ENDIF}
+  end;
+
+begin
+  //GetDir(0, GameDir);
+  binPath := GetBinaryPath();
+  xput('binPath=['+binPath+']');
+
+  for i := 1 to ParamCount do
+  begin
+    // use it only if you ketmar
+    if (ParamStr(i) = '--cwd') then
+    begin
+      forceCurrentDir := true;
+      break
+    end
+  end;
+
+  i := 1;
+  while i < ParamCount do
+  begin
+    case ParamStr(i) of
+    '--rw-dir':
+      begin
+        Inc(i);
+        rwdir := ParamStr(i);
+        (* RW *)
+        AddPath(LogDirs, e_CatPath(rwdir, ''));
+        AddPath(SaveDirs, e_CatPath(rwdir, 'data'));
+        AddPath(CacheDirs, e_CatPath(rwdir, 'data/cache'));
+        AddPath(ConfigDirs, e_CatPath(rwdir, ''));
+        AddPath(MapDownloadDirs, e_CatPath(rwdir, 'maps/downloads'));
+        AddPath(WadDownloadDirs, e_CatPath(rwdir, 'wads/downloads'));
+        AddPath(ScreenshotDirs, e_CatPath(rwdir, 'screenshots'));
+        (* RO *)
+        AddPath(DataDirs, e_CatPath(rwdir, 'data'));
+        AddPath(ModelDirs, e_CatPath(rwdir, 'data/models'));
+        AddPath(MegawadDirs, e_CatPath(rwdir, 'maps/megawads'));
+        AddPath(MapDirs, e_CatPath(rwdir, 'maps'));
+        AddPath(WadDirs, e_CatPath(rwdir, 'wads'));
+      end;
+    '--ro-dir':
+      begin
+        Inc(i);
+        rodir := ParamStr(i);
+        (* RO *)
+        AddPath(DataDirs, e_CatPath(rodir, 'data'));
+        AddPath(ModelDirs, e_CatPath(rodir, 'data/models'));
+        AddPath(MegawadDirs, e_CatPath(rodir, 'maps/megawads'));
+        AddPath(MapDirs, e_CatPath(rodir, 'maps'));
+        AddPath(WadDirs, e_CatPath(rodir, 'wads'));
+      end;
+    end;
+    Inc(i)
+  end;
+
+  (* RO *)
+  rodirs := GetDefaultRODirs();
+  AddDef(DataDirs, rodirs, 'data');
+  AddDef(ModelDirs, rodirs, 'data/models');
+  AddDef(MegawadDirs, rodirs, 'maps/megawads');
+  AddDef(MapDirs, rodirs, 'maps');
+  AddDef(WadDirs, rodirs, 'wads');
+
+  (* RW *)
+  rwdirs := GetDefaultRWDirs();
+  AddDef(LogDirs, rwdirs, '');
+  AddDef(SaveDirs, rwdirs, 'data');
+  AddDef(CacheDirs, rwdirs, 'data/cache');
+  AddDef(ConfigDirs, rwdirs, '');
+  AddDef(MapDownloadDirs, rwdirs, 'maps/downloads');
+  AddDef(WadDownloadDirs, rwdirs, 'wads/downloads');
+  AddDef(ScreenshotDirs, rwdirs, 'screenshots');
+
+  for i := 0 to High(MapDirs) do
+    AddPath(AllMapDirs, MapDirs[i]);
+  for i := 0 to High(MegawadDirs) do
+    AddPath(AllMapDirs, MegawadDirs[i]);
+
+  if LogFileName = '' then
+  begin
+    rwdir := e_GetWriteableDir(LogDirs, false);
+    if rwdir <> '' then
+    begin
+      {$IFDEF HEADLESS}
+        LogFileName := e_CatPath(rwdir, 'Doom2DF_H.log');
+      {$ELSE}
+        LogFileName := e_CatPath(rwdir, 'Doom2DF.log');
+      {$ENDIF}
+    end
+  end;
+
+  xput('binPath=['+binPath+']');
+end;
+
+procedure InitPrep;
+  {$IF DEFINED(ANDROID) AND DEFINED(USE_SDLMIXER)}
+    var timiditycfg: AnsiString;
+  {$ENDIF}
+  var i: Integer;
+begin
+  {$IFDEF HEADLESS}
+    conbufDumpToStdOut := true;
+  {$ENDIF}
+  for i := 1 to ParamCount do
+  begin
+    if (ParamStr(i) = '--con-stdout') then
+    begin
+      conbufDumpToStdOut := true;
+      break
+    end
+  end;
+
+  if LogFileName <> '' then
+    e_InitLog(LogFileName, TWriteMode.WM_NEWFILE);
+  e_InitWritelnDriver();
+  e_WriteLog('Doom 2D: Forever version ' + GAME_VERSION + ' proto ' + IntToStr(NET_PROTOCOL_VER), TMsgType.Notify);
+  e_WriteLog('Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME, TMsgType.Notify);
+
+  e_LogWritefln('BINARY PATH: [%s]', [binPath], TMsgType.Notify);
+
+  PrintDirs('DataDirs', DataDirs);
+  PrintDirs('ModelDirs', ModelDirs);
+  PrintDirs('MegawadDirs', MegawadDirs);
+  PrintDirs('MapDirs', MapDirs);
+  PrintDirs('WadDirs', WadDirs);
+
+  PrintDirs('LogDirs', LogDirs);
+  PrintDirs('SaveDirs', SaveDirs);
+  PrintDirs('CacheDirs', CacheDirs);
+  PrintDirs('ConfigDirs', ConfigDirs);
+  PrintDirs('ScreenshotDirs', ScreenshotDirs);
+  PrintDirs('MapDownloadDirs', MapDownloadDirs);
+  PrintDirs('WadDownloadDirs', WadDownloadDirs);
+
+  GameWAD := e_FindWad(DataDirs, 'GAME');
+  if GameWad = '' then
+  begin
+    e_WriteLog('GAME.WAD not installed?', TMsgType.Fatal);
+    {$IF DEFINED(USE_SDL2) AND NOT DEFINED(HEADLESS)}
+      if forceCurrentDir = false then
+        SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, 'Doom 2D Forever', 'GAME.WAD not installed?', nil);
+    {$ENDIF}
+    e_DeinitLog;
+    Halt(1);
+  end;
+
+  {$IF DEFINED(ANDROID) AND DEFINED(USE_SDLMIXER)}
+    timiditycfg := 'timidity.cfg';
+    if e_FindResource(ConfigDirs, timiditycfg) = true then
+    begin
+      timiditycfg := ExpandFileName(timiditycfg);
+      SetEnvVar('TIMIDITY_CFG', timiditycfg);
+      e_LogWritefln('Set TIMIDITY_CFG = "%s"', [timiditycfg]);
+    end;
+  {$ENDIF}
+end;
+
+procedure Main();
+{$IFDEF ENABLE_HOLMES}
+  var flexloaded: Boolean;
 {$ENDIF}
+  var s: AnsiString;
+begin
+  InitPath;
+  InitPrep;
+  e_InitInput;
+  sys_Init;
 
-{$IFNDEF HEADLESS}
+  s := CONFIG_FILENAME;
+  if e_FindResource(ConfigDirs, s) = true then
+  begin
+    g_Options_Read(s)
+  end
+  else
+  begin
+    g_Options_SetDefault;
+    g_Options_SetDefaultVideo
+  end;
+  if sys_SetDisplayMode(gScreenWidth, gScreenHeight, gBPP, gFullScreen) = False then
+    raise Exception.Create('Failed to set videomode on startup.');
+
+  g_Console_SysInit;
+  e_WriteLog(gLanguage, TMsgType.Notify);
+  g_Language_Set(gLanguage);
+
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded := true;
   if not fuiAddWad('flexui.wad') then
   begin
@@ -146,20 +547,29 @@ begin
     end;
   end;
   g_holmes_imfunctional := not flexloaded;
+
+  if (not g_holmes_imfunctional) then
+  begin
+    uiInitialize();
+    uiContext.font := 'win14';
+  end;
+
+  if assigned(oglInitCB) then oglInitCB;
 {$ENDIF}
 
+  //g_Res_CreateDatabases(true); // it will be done before connecting to the server for the first time
+
   e_WriteLog('Entering SDLMain', TMsgType.Notify);
 
-{$WARNINGS OFF}
-  SDLMain();
-{$WARNINGS ON}
+  {$WARNINGS OFF}
+    SDLMain();
+  {$WARNINGS ON}
 
-{$IFNDEF HEADLESS}
-  SDL_StopTextInput();
-{$ENDIF}
+  {$IFDEF ENABLE_HOLMES}
+    if assigned(oglDeinitCB) then oglDeinitCB;
+  {$ENDIF}
 
-  e_WriteLog('Releasing SDL', TMsgType.Notify);
-  SDL_Quit();
+  sys_Final;
 end;
 
 procedure Init();
@@ -178,13 +588,14 @@ begin
   NoSound := False;
 {$ENDIF}
 
-  e_WriteLog('Init Input', TMsgType.Notify);
-  e_InitInput();
+  g_Touch_Init;
 
+(*
   if (e_JoysticksAvailable > 0) then
     e_WriteLog('Input: Joysticks available.', TMsgType.Notify)
   else
     e_WriteLog('Input: No Joysticks.', TMsgType.Notify);
+*)
 
   if (not gNoSound) then
   begin
@@ -204,12 +615,12 @@ begin
   e_WriteLog('Releasing engine', TMsgType.Notify);
   e_ReleaseEngine();
 
-  e_WriteLog('Releasing Input', TMsgType.Notify);
+  e_WriteLog('Releasing input', TMsgType.Notify);
   e_ReleaseInput();
 
   if not gNoSound then
   begin
-    e_WriteLog('Releasing FMOD', TMsgType.Notify);
+    e_WriteLog('Releasing sound', TMsgType.Notify);
     e_ReleaseSoundSystem();
   end;
 end;
@@ -372,11 +783,9 @@ begin
   s2 := Copy(charbuff, 15, 2);
   if CheckCheat(I_GAME_CHEAT_CHANGEMAP, 2) and (s2[1] >= '0') and (s2[1] <= '9') and (s2[2] >= '0') and (s2[2] <= '9') then
   begin
-    if g_Map_Exist(MapsDir+gGameSettings.WAD+':\MAP'+s2) then
+    if g_Map_Exist(gGameSettings.WAD + ':\MAP' + s2) then
     begin
-      c := 'MAP00';
-      c[3] := s2[1];
-      c[4] := s2[2];
+      c := 'MAP' + s2;
       g_Game_ExitLevel(c);
     end;
     goto Cheated;
@@ -466,36 +875,19 @@ end;
 
 
 procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}
 var
   Msg: g_gui.TMessage;
+{$ENDIF}
 begin
+{$IFNDEF HEADLESS}
   case K of
-    IK_PAUSE: // <Pause/Break>:
-      begin
-        if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
-      end;
-
-    IK_BACKQUOTE: // <`/~/¨/¸>:
-      begin
-        g_Console_Switch();
-      end;
-
-    IK_ESCAPE: // <Esc>:
+    VK_ESCAPE: // <Esc>:
       begin
-        if gChatShow then
-        begin
-          g_Console_Chat_Switch();
-          Exit;
-        end;
-
-        if gConsoleShow then
-        begin
-          g_Console_Switch();
-        end
-        else if (g_ActiveWindow <> nil) then
+        if (g_ActiveWindow <> nil) then
         begin
           Msg.Msg := WM_KEYDOWN;
-          Msg.WParam := IK_ESCAPE;
+          Msg.WParam := VK_ESCAPE;
           g_ActiveWindow.OnMessage(Msg);
           if (not g_Game_IsNet) and (g_ActiveWindow = nil) then g_Game_Pause(false); //Fn loves to do this
         end
@@ -561,6 +953,7 @@ begin
         end;
       end;
   end;
+{$ENDIF}
 end;
 
 
@@ -569,11 +962,9 @@ var
   Msg: g_gui.TMessage;
   a: Integer;
 begin
-  if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then Exit;
-
   if gConsoleShow or gChatShow then
   begin
-    g_Console_Char(C);
+    g_Console_Char(C)
   end
   else if (g_ActiveWindow <> nil) then
   begin
@@ -589,5 +980,4 @@ begin
   end;
 end;
 
-
 end.