render: move screenshorts into render

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

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 1cf480864080a2c4115db2cae221b07de7e16299..f341dab77d3be947924e6ec0592c0ef444e8aa42 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.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
  *
  * 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


@@ -19,8 +18,11 @@ unit g_game;
 interface
 
 uses
 interface
 
 uses

-  g_basic, g_player, e_graphics, Classes, g_res_downloader,
-  SysUtils, g_sound, g_gui, MAPDEF, wadreader, md5, xprofiler;
+  SysUtils, Classes,
+  MAPDEF,
+  g_base, g_basic, g_player, r_graphics, g_res_downloader,
+  g_sound, g_gui, utils, md5, mempool, xprofiler,
+  g_touch, g_weapons;

 
 type
   TGameSettings = record
 
 type
   TGameSettings = record


@@ -29,6 +31,8 @@ type
     TimeLimit: Word;
     GoalLimit: Word;
     WarmupTime: Word;
     TimeLimit: Word;
     GoalLimit: Word;
     WarmupTime: Word;

+    SpawnInvul: Word;
+    ItemRespawnTime: Word;

     MaxLives: Byte;
     Options: LongWord;
     WAD: String;
     MaxLives: Byte;
     Options: LongWord;
     WAD: String;


@@ -47,6 +51,12 @@ type
     DEStr: String;
   end;
 
     DEStr: String;
   end;
 

+  TChatSound = record
+    Sound: TPlayableSound;
+    Tags: Array of String;
+    FullWord: Boolean;
+  end;
+

   TPlayerSettings = record
     Name: String;
     Model: String;
   TPlayerSettings = record
     Name: String;
     Model: String;


@@ -70,14 +80,12 @@ function  g_Game_IsNet(): Boolean;
 function  g_Game_IsServer(): Boolean;
 function  g_Game_IsClient(): Boolean;
 procedure g_Game_Init();
 function  g_Game_IsServer(): Boolean;
 function  g_Game_IsClient(): Boolean;
 procedure g_Game_Init();

-procedure g_Game_Free();
+procedure g_Game_Free (freeTextures: Boolean=true);

 procedure g_Game_LoadData();
 procedure g_Game_FreeData();
 procedure g_Game_Update();
 procedure g_Game_LoadData();
 procedure g_Game_FreeData();
 procedure g_Game_Update();

-procedure g_Game_Draw();
+procedure g_Game_PreUpdate();

 procedure g_Game_Quit();
 procedure g_Game_Quit();

-procedure g_Game_SetupScreenSize();
-procedure g_Game_ChangeResolution(newWidth, newHeight: Word; nowFull, nowMax: Boolean);

 function  g_Game_ModeToText(Mode: Byte): string;
 function  g_Game_TextToMode(Mode: string): Byte;
 procedure g_Game_ExecuteEvent(Name: String);
 function  g_Game_ModeToText(Mode: Byte): string;
 function  g_Game_TextToMode(Mode: string): Byte;
 procedure g_Game_ExecuteEvent(Name: String);


@@ -93,15 +101,15 @@ procedure g_Game_StartClient(Addr: String; Port: Word; PW: String);
 procedure g_Game_Restart();
 procedure g_Game_RestartLevel();
 procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
 procedure g_Game_Restart();
 procedure g_Game_RestartLevel();
 procedure g_Game_RestartRound(NoMapRestart: Boolean = False);

-procedure g_Game_ClientWAD(NewWAD: String; WHash: TMD5Digest);
-procedure g_Game_SaveOptions();
-function  g_Game_StartMap(Map: String; Force: Boolean = False): Boolean;
-procedure g_Game_ChangeMap(MapPath: String);
-procedure g_Game_ExitLevel(Map: Char16);
+function  g_Game_ClientWAD (NewWAD: String; const WHash: TMD5Digest): AnsiString;
+function  g_Game_StartMap(asMegawad: Boolean; Map: String; Force: Boolean = False; const oldMapPath: AnsiString=''): Boolean;
+procedure g_Game_ChangeMap(const MapPath: String);
+procedure g_Game_ExitLevel(const Map: AnsiString);

 function  g_Game_GetFirstMap(WAD: String): String;
 function  g_Game_GetNextMap(): String;
 procedure g_Game_NextLevel();
 procedure g_Game_Pause(Enable: Boolean);
 function  g_Game_GetFirstMap(WAD: String): String;
 function  g_Game_GetNextMap(): String;
 procedure g_Game_NextLevel();
 procedure g_Game_Pause(Enable: Boolean);

+procedure g_Game_HolmesPause(Enable: Boolean);

 procedure g_Game_InGameMenu(Show: Boolean);
 function  g_Game_IsWatchedPlayer(UID: Word): Boolean;
 function  g_Game_IsWatchedTeam(Team: Byte): Boolean;
 procedure g_Game_InGameMenu(Show: Boolean);
 function  g_Game_IsWatchedPlayer(UID: Word): Boolean;
 function  g_Game_IsWatchedTeam(Team: Byte): Boolean;


@@ -111,25 +119,35 @@ procedure g_Game_PauseAllSounds(Enable: Boolean);
 procedure g_Game_StopAllSounds(all: Boolean);
 procedure g_Game_UpdateTriggerSounds();
 function  g_Game_GetMegaWADInfo(WAD: String): TMegaWADInfo;
 procedure g_Game_StopAllSounds(all: Boolean);
 procedure g_Game_UpdateTriggerSounds();
 function  g_Game_GetMegaWADInfo(WAD: String): TMegaWADInfo;

+procedure g_Game_ChatSound(Text: String; Taunt: Boolean = True);

 procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
 procedure g_Game_Announce_KillCombo(Param: Integer);
 procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
 procedure g_Game_Announce_KillCombo(Param: Integer);

+procedure g_Game_Announce_BodyKill(SpawnerUID: Word);

 procedure g_Game_StartVote(Command, Initiator: string);
 procedure g_Game_CheckVote;
 procedure g_Game_StartVote(Command, Initiator: string);
 procedure g_Game_CheckVote;

-procedure g_TakeScreenShot();
+procedure g_TakeScreenShot(Filename: string = '');

 procedure g_FatalError(Text: String);
 procedure g_SimpleError(Text: String);
 function  g_Game_IsTestMap(): Boolean;
 procedure g_Game_DeleteTestMap();
 procedure g_FatalError(Text: String);
 procedure g_SimpleError(Text: String);
 function  g_Game_IsTestMap(): Boolean;
 procedure g_Game_DeleteTestMap();

-procedure GameCVars(P: SArray);
-procedure GameCommands(P: SArray);
-procedure GameCheats(P: SArray);
-procedure DebugCommands(P: SArray);
+procedure GameCVars(P: SSArray);
+procedure PlayerSettingsCVars(P: SSArray);
+procedure SystemCommands(P: SSArray);
+procedure GameCommands(P: SSArray);
+procedure GameCheats(P: SSArray);
+procedure DebugCommands(P: SSArray);

 procedure g_Game_Process_Params;
 procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean);
 procedure g_Game_Process_Params;
 procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean);

-procedure g_Game_StepLoading();
+procedure g_Game_StepLoading(Value: Integer = -1);

 procedure g_Game_ClearLoading();
 procedure g_Game_SetDebugMode();
 procedure g_Game_ClearLoading();
 procedure g_Game_SetDebugMode();

-procedure DrawLoadingStat();
+
+function IsActivePlayer(p: TPlayer): Boolean;
+function GetActivePlayerID_Next(Skip: Integer = -1): Integer;
+procedure SortGameStat(var stat: TPlayerStatArray);
+
+procedure KeyPress (K: Word);
+procedure CharPress (C: AnsiChar);

 
 { procedure SetWinPause(Enable: Boolean); }
 
 
 { procedure SetWinPause(Enable: Boolean); }
 


@@ -160,13 +178,17 @@ const
   EXIT_ENDLEVELSINGLE  = 4;
   EXIT_ENDLEVELCUSTOM  = 5;
 
   EXIT_ENDLEVELSINGLE  = 4;
   EXIT_ENDLEVELCUSTOM  = 5;
 

-  GAME_OPTION_RESERVED     = 1;
-  GAME_OPTION_TEAMDAMAGE   = 2;
-  GAME_OPTION_ALLOWEXIT    = 4;
-  GAME_OPTION_WEAPONSTAY   = 8;
-  GAME_OPTION_MONSTERS     = 16;
-  GAME_OPTION_BOTVSPLAYER  = 32;
-  GAME_OPTION_BOTVSMONSTER = 64;
+  GAME_OPTION_RESERVED          = 1;
+  GAME_OPTION_TEAMDAMAGE        = 2;
+  GAME_OPTION_ALLOWEXIT         = 4;
+  GAME_OPTION_WEAPONSTAY        = 8;
+  GAME_OPTION_MONSTERS          = 16;
+  GAME_OPTION_BOTVSPLAYER       = 32;
+  GAME_OPTION_BOTVSMONSTER      = 64;
+  GAME_OPTION_DMKEYS            = 128;
+  GAME_OPTION_TEAMHITTRACE      = 256;
+  GAME_OPTION_TEAMHITPROJECTILE = 512;
+  GAME_OPTION_TEAMABSORBDAMAGE = 1024;

 
   STATE_NONE        = 0;
   STATE_MENU        = 1;
 
   STATE_NONE        = 0;
   STATE_MENU        = 1;


@@ -190,6 +212,7 @@ const
   DE_GLOBEVENT = 0;
   DE_BFGHIT    = 1;
   DE_KILLCOMBO = 2;
   DE_GLOBEVENT = 0;
   DE_BFGHIT    = 1;
   DE_KILLCOMBO = 2;

+  DE_BODYKILL  = 3;

 
   ANNOUNCE_NONE   = 0;
   ANNOUNCE_ME     = 1;
 
   ANNOUNCE_NONE   = 0;
   ANNOUNCE_ME     = 1;


@@ -197,14 +220,20 @@ const
   ANNOUNCE_ALL    = 3;
 
   CONFIG_FILENAME = 'Doom2DF.cfg';
   ANNOUNCE_ALL    = 3;
 
   CONFIG_FILENAME = 'Doom2DF.cfg';

-  LOG_FILENAME = 'Doom2DF.log';

 
   TEST_MAP_NAME = '$$$_TEST_$$$';
 
   STD_PLAYER_MODEL = 'Doomer';
 
 
   TEST_MAP_NAME = '$$$_TEST_$$$';
 
   STD_PLAYER_MODEL = 'Doomer';
 

+{$IFDEF HEADLESS}
+  DEFAULT_PLAYERS = 0;
+{$ELSE}
+  DEFAULT_PLAYERS = 1;
+{$ENDIF}
+
+  STATFILE_VERSION = $03;
+

 var
 var

-  gStdFont: DWORD;

   gGameSettings: TGameSettings;
   gPlayer1Settings: TPlayerSettings;
   gPlayer2Settings: TPlayerSettings;
   gGameSettings: TGameSettings;
   gPlayer1Settings: TPlayerSettings;
   gPlayer2Settings: TPlayerSettings;


@@ -216,24 +245,33 @@ var
   gPlayer2: TPlayer = nil;
   gPlayerDrawn: TPlayer = nil;
   gTime: LongWord;
   gPlayer2: TPlayer = nil;
   gPlayerDrawn: TPlayer = nil;
   gTime: LongWord;

+  gLerpFactor: Single = 1.0;

   gSwitchGameMode: Byte = GM_DM;
   gHearPoint1, gHearPoint2: THearPoint;
   gSoundEffectsDF: Boolean = False;
   gSoundTriggerTime: Word = 0;
   gSwitchGameMode: Byte = GM_DM;
   gHearPoint1, gHearPoint2: THearPoint;
   gSoundEffectsDF: Boolean = False;
   gSoundTriggerTime: Word = 0;

-  gAnnouncer: Byte = ANNOUNCE_NONE;
+  gAnnouncer: Integer = ANNOUNCE_NONE;

   goodsnd: array[0..3] of TPlayableSound;
   killsnd: array[0..3] of TPlayableSound;
   goodsnd: array[0..3] of TPlayableSound;
   killsnd: array[0..3] of TPlayableSound;

+  hahasnd: array[0..2] of TPlayableSound;
+  sound_get_flag: array[0..1] of TPlayableSound;
+  sound_lost_flag: array[0..1] of TPlayableSound;
+  sound_ret_flag: array[0..1] of TPlayableSound;
+  sound_cap_flag: array[0..1] of TPlayableSound;
+  gBodyKillEvent: Integer = -1;

   gDefInterTime: ShortInt = -1;
   gInterEndTime: LongWord = 0;
   gInterTime: LongWord = 0;
   gServInterTime: Byte = 0;
   gGameStartTime: LongWord = 0;
   gTotalMonsters: Integer = 0;
   gDefInterTime: ShortInt = -1;
   gInterEndTime: LongWord = 0;
   gInterTime: LongWord = 0;
   gServInterTime: Byte = 0;
   gGameStartTime: LongWord = 0;
   gTotalMonsters: Integer = 0;

-  gPause: Boolean;
-  gShowTime: Boolean = True;
+  gPauseMain: Boolean = false;
+  gPauseHolmes: Boolean = false;
+  gShowTime: Boolean = False;

   gShowFPS: Boolean = False;
   gShowGoals: Boolean = True;
   gShowStat: Boolean = True;
   gShowFPS: Boolean = False;
   gShowGoals: Boolean = True;
   gShowStat: Boolean = True;

+  gShowPIDs: Boolean = False;

   gShowKillMsg: Boolean = True;
   gShowLives: Boolean = True;
   gShowPing: Boolean = False;
   gShowKillMsg: Boolean = True;
   gShowLives: Boolean = True;
   gShowPing: Boolean = False;


@@ -251,6 +289,10 @@ var
   gSpectViewTwo: Boolean = False;
   gSpectPID1: Integer = -1;
   gSpectPID2: Integer = -1;
   gSpectViewTwo: Boolean = False;
   gSpectPID1: Integer = -1;
   gSpectPID2: Integer = -1;

+  gSpectAuto: Boolean = False;
+  gSpectAutoNext: LongWord;
+  gSpectAutoStepX: Integer;
+  gSpectAutoStepY: Integer;

   gMusic: TMusic = nil;
   gLoadGameMode: Boolean;
   gCheats: Boolean = False;
   gMusic: TMusic = nil;
   gLoadGameMode: Boolean;
   gCheats: Boolean = False;


@@ -258,12 +300,10 @@ var
   gMapToDelete: String;
   gTempDelete: Boolean = False;
   gLastMap: Boolean = False;
   gMapToDelete: String;
   gTempDelete: Boolean = False;
   gLastMap: Boolean = False;

-  gWinPosX, gWinPosY: Integer;
-  gWinSizeX, gWinSizeY: Integer;
-  gWinFrameX, gWinFrameY, gWinCaption: Integer;
-  gWinActive: Boolean = True; // by default window is active, lol
+  gScreenWidth: Word;
+  gScreenHeight: Word;

   gResolutionChange: Boolean = False;
   gResolutionChange: Boolean = False;

-  gRC_Width, gRC_Height: Word;
+  gRC_Width, gRC_Height: Integer;

   gRC_FullScreen, gRC_Maximized: Boolean;
   gLanguageChange: Boolean = False;
   gDebugMode: Boolean = False;
   gRC_FullScreen, gRC_Maximized: Boolean;
   gLanguageChange: Boolean = False;
   gDebugMode: Boolean = False;


@@ -299,6 +339,14 @@ var
   gVotesEnabled: Boolean = True;
   gEvents: Array of TGameEvent;
   gDelayedEvents: Array of TDelayedEvent;
   gVotesEnabled: Boolean = True;
   gEvents: Array of TGameEvent;
   gDelayedEvents: Array of TDelayedEvent;

+  gUseChatSounds: Boolean = True;
+  gChatSounds: Array of TChatSound;
+  gSelectWeapon: Array [0..1, WP_FIRST..WP_LAST] of Boolean; // [player, weapon]
+  gInterReadyCount: Integer = 0;
+
+  g_dbg_ignore_bounds: Boolean = false;
+  r_smallmap_h: Integer = 0; // 0: left; 1: center; 2: right
+  r_smallmap_v: Integer = 2; // 0: top; 1: center; 2: bottom

 
   // move button values:
   // bits 0-1: l/r state:
 
   // move button values:
   // bits 0-1: l/r state:


@@ -324,54 +372,427 @@ var
   g_rlayer_water: Boolean = true;
   g_rlayer_fore: Boolean = true;
 
   g_rlayer_water: Boolean = true;
   g_rlayer_fore: Boolean = true;
 

+  wNeedTimeReset: Boolean = false;

 
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
 procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
 
 
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
 procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
 

-function conIsCheatsEnabled (): Boolean;
+function conIsCheatsEnabled (): Boolean; inline;
+function gPause (): Boolean; inline;
+
+  type (* private state *)
+    TEndCustomGameStat = record
+      PlayerStat: TPlayerStatArray;
+      TeamStat: TTeamStat;
+      GameTime: LongWord;
+      GameMode: Byte;
+      Map, MapName: String;
+    end;
+
+    TEndSingleGameStat = record
+      PlayerStat: Array [0..1] of record
+        Kills: Integer;
+        Secrets: Integer;
+      end;
+      GameTime: LongWord;
+      TwoPlayers: Boolean;
+      TotalSecrets: Integer;
+    end;
+
+    TLoadingStat = record
+      CurValue: Integer;
+      MaxValue: Integer;
+      ShowCount: Integer;
+      Msgs: Array of String;
+      NextMsg: Word;
+      PBarWasHere: Boolean; // did we draw a progress bar for this message?
+    end;
+
+    TDynLight = record
+      x, y, radius: Integer;
+      r, g, b, a: Single;
+      exploCount: Integer;
+      exploRadius: Integer;
+    end;

 
 

+  var (* private state *)
+    CustomStat: TEndCustomGameStat;
+    StatShotDone: Boolean;
+    StatFilename: string = ''; // used by stat screenshot to save with the same name as the csv
+    SingleStat: TEndSingleGameStat;
+    LoadingStat: TLoadingStat;
+    MessageText: String;
+    IsDrawStat: Boolean;
+    EndingGameCounter: Byte;
+    UPS: Word;
+    g_playerLight: Boolean;
+    g_dynLights: array of TDynLight = nil;
+    g_dynLightCount: Integer = 0;
+    EndPicPath: AnsiString; // full path, used by render

 
 implementation
 
 uses
 
 implementation
 
 uses

-  g_textures, g_main, g_window, g_menu,
-  e_input, e_log, g_console, g_items, g_map, g_panel,
-  g_playermodel, g_gfx, g_options, g_weapons, Math,
+{$IFDEF ENABLE_HOLMES}
+  g_holmes,
+{$ENDIF}
+  e_res, g_window, g_menu, r_render, r_gfx,
+  e_input, e_log, g_console, r_console, g_items, g_map, g_panel,
+  g_playermodel, g_gfx, g_options, Math,

   g_triggers, g_monsters, e_sound, CONFIG,
   g_triggers, g_monsters, e_sound, CONFIG,

-  BinEditor, g_language, g_net, SDL,
-  ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
-  utils, sfs, g_holmes;
+  g_language, g_net, g_phys,
+  ENet, e_msg, g_netmsg, g_netmaster,
+  sfs, wadreader, g_system, r_playermodel;

 
 

+  var
+    charbuff: packed array [0..15] of AnsiChar = (
+      ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '
+    );

 
 

-// ////////////////////////////////////////////////////////////////////////// //
-function conIsCheatsEnabled (): Boolean;
+function Translit (const S: AnsiString): AnsiString;
+var
+  i: Integer;

 begin
 begin

-  result := false;
+  Result := S;
+  for i := 1 to Length(Result) do
+  begin
+    case Result[i] of
+      #$C9: Result[i] := 'Q';
+      #$D6: Result[i] := 'W';
+      #$D3: Result[i] := 'E';
+      #$CA: Result[i] := 'R';
+      #$C5: Result[i] := 'T';
+      #$CD: Result[i] := 'Y';
+      #$C3: Result[i] := 'U';
+      #$D8: Result[i] := 'I';
+      #$D9: Result[i] := 'O';
+      #$C7: Result[i] := 'P';
+      #$D5: Result[i] := '['; //Chr(219);
+      #$DA: Result[i] := ']'; //Chr(221);
+      #$D4: Result[i] := 'A';
+      #$DB: Result[i] := 'S';
+      #$C2: Result[i] := 'D';
+      #$C0: Result[i] := 'F';
+      #$CF: Result[i] := 'G';
+      #$D0: Result[i] := 'H';
+      #$CE: Result[i] := 'J';
+      #$CB: Result[i] := 'K';
+      #$C4: Result[i] := 'L';
+      #$C6: Result[i] := ';'; //Chr(186);
+      #$DD: Result[i] := #39; //Chr(222);
+      #$DF: Result[i] := 'Z';
+      #$D7: Result[i] := 'X';
+      #$D1: Result[i] := 'C';
+      #$CC: Result[i] := 'V';
+      #$C8: Result[i] := 'B';
+      #$D2: Result[i] := 'N';
+      #$DC: Result[i] := 'M';
+      #$C1: Result[i] := ','; //Chr(188);
+      #$DE: Result[i] := '.'; //Chr(190);
+    end;
+  end;
+end;
+
+
+function CheckCheat (ct: TStrings_Locale; eofs: Integer=0): Boolean;
+var
+  ls1, ls2: string;
+begin
+  ls1 :=          CheatEng[ct];
+  ls2 := Translit(CheatRus[ct]);
+  if length(ls1) = 0 then ls1 := '~';
+  if length(ls2) = 0 then ls2 := '~';
+  result :=
+    (Copy(charbuff, 17-Length(ls1)-eofs, Length(ls1)) = ls1) or
+    (Translit(Copy(charbuff, 17-Length(ls1)-eofs, Length(ls1))) = ls1) or
+    (Copy(charbuff, 17-Length(ls2)-eofs, Length(ls2)) = ls2) or
+    (Translit(Copy(charbuff, 17-Length(ls2)-eofs, Length(ls2))) = ls2);
+  {
+  if ct = I_GAME_CHEAT_JETPACK then
+  begin
+    e_WriteLog('ls1: ['+ls1+']', MSG_NOTIFY);
+    e_WriteLog('ls2: ['+ls2+']', MSG_NOTIFY);
+    e_WriteLog('bf0: ['+Copy(charbuff, 17-Length(ls1)-eofs, Length(ls1))+']', MSG_NOTIFY);
+    e_WriteLog('bf1: ['+Translit(Copy(charbuff, 17-Length(ls1)-eofs, Length(ls1)))+']', MSG_NOTIFY);
+    e_WriteLog('bf2: ['+Copy(charbuff, 17-Length(ls2)-eofs, Length(ls2))+']', MSG_NOTIFY);
+    e_WriteLog('bf3: ['+Translit(Copy(charbuff, 17-Length(ls2)-eofs, Length(ls2)))+']', MSG_NOTIFY);
+  end;
+  }
+end;
+
+procedure Cheat ();
+const
+  CHEAT_DAMAGE = 500;
+label
+  Cheated;
+var
+  s, s2: string;
+  c: ShortString;
+  a: Integer;
+begin
+  {

   if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and
   if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and

-     (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then exit;
-  result := true;
+    (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode))
+    or g_Game_IsNet then Exit;
+  }
+  if not gGameOn then exit;
+  if not conIsCheatsEnabled then exit;
+
+  s := 'SOUND_GAME_RADIO';
+
+  //
+  if CheckCheat(I_GAME_CHEAT_GODMODE) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.GodMode := not gPlayer1.GodMode;
+    if gPlayer2 <> nil then gPlayer2.GodMode := not gPlayer2.GodMode;
+    goto Cheated;
+  end;
+  // RAMBO
+  if CheckCheat(I_GAME_CHEAT_WEAPONS) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.AllRulez(False);
+    if gPlayer2 <> nil then gPlayer2.AllRulez(False);
+    goto Cheated;
+  end;
+  // TANK
+  if CheckCheat(I_GAME_CHEAT_HEALTH) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.AllRulez(True);
+    if gPlayer2 <> nil then gPlayer2.AllRulez(True);
+    goto Cheated;
+  end;
+  // IDDQD
+  if CheckCheat(I_GAME_CHEAT_DEATH) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.Damage(CHEAT_DAMAGE, 0, 0, 0, HIT_TRAP);
+    if gPlayer2 <> nil then gPlayer2.Damage(CHEAT_DAMAGE, 0, 0, 0, HIT_TRAP);
+    s := 'SOUND_MONSTER_HAHA';
+    goto Cheated;
+  end;
+  //
+  if CheckCheat(I_GAME_CHEAT_DOORS) then
+  begin
+    g_Triggers_OpenAll();
+    goto Cheated;
+  end;
+  // GOODBYE
+  if CheckCheat(I_GAME_CHEAT_NEXTMAP) then
+  begin
+    if gTriggers <> nil then
+      for a := 0 to High(gTriggers) do
+        if gTriggers[a].TriggerType = TRIGGER_EXIT then
+        begin
+          gExitByTrigger := True;
+          //g_Game_ExitLevel(gTriggers[a].Data.MapName);
+          g_Game_ExitLevel(gTriggers[a].tgcMap);
+          Break;
+        end;
+    goto Cheated;
+  end;
+  //
+  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(gGameSettings.WAD + ':\MAP' + s2) then
+    begin
+      c := 'MAP' + s2;
+      g_Game_ExitLevel(c);
+    end;
+    goto Cheated;
+  end;
+  //
+  if CheckCheat(I_GAME_CHEAT_FLY) then
+  begin
+    gFly := not gFly;
+    goto Cheated;
+  end;
+  // BULLFROG
+  if CheckCheat(I_GAME_CHEAT_JUMPS) then
+  begin
+    VEL_JUMP := 30-VEL_JUMP;
+    goto Cheated;
+  end;
+  // FORMULA1
+  if CheckCheat(I_GAME_CHEAT_SPEED) then
+  begin
+    MAX_RUNVEL := 32-MAX_RUNVEL;
+    goto Cheated;
+  end;
+  // CONDOM
+  if CheckCheat(I_GAME_CHEAT_SUIT) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.GiveItem(ITEM_SUIT);
+    if gPlayer2 <> nil then gPlayer2.GiveItem(ITEM_SUIT);
+    goto Cheated;
+  end;
+  //
+  if CheckCheat(I_GAME_CHEAT_AIR) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.GiveItem(ITEM_OXYGEN);
+    if gPlayer2 <> nil then gPlayer2.GiveItem(ITEM_OXYGEN);
+    goto Cheated;
+  end;
+  // PURELOVE
+  if CheckCheat(I_GAME_CHEAT_BERSERK) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.GiveItem(ITEM_MEDKIT_BLACK);
+    if gPlayer2 <> nil then gPlayer2.GiveItem(ITEM_MEDKIT_BLACK);
+    goto Cheated;
+  end;
+  //
+  if CheckCheat(I_GAME_CHEAT_JETPACK) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.GiveItem(ITEM_JETPACK);
+    if gPlayer2 <> nil then gPlayer2.GiveItem(ITEM_JETPACK);
+    goto Cheated;
+  end;
+  // CASPER
+  if CheckCheat(I_GAME_CHEAT_NOCLIP) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.SwitchNoClip;
+    if gPlayer2 <> nil then gPlayer2.SwitchNoClip;
+    goto Cheated;
+  end;
+  //
+  if CheckCheat(I_GAME_CHEAT_NOTARGET) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.NoTarget := not gPlayer1.NoTarget;
+    if gPlayer2 <> nil then gPlayer2.NoTarget := not gPlayer2.NoTarget;
+    goto Cheated;
+  end;
+  // INFERNO
+  if CheckCheat(I_GAME_CHEAT_NORELOAD) then
+  begin
+    if gPlayer1 <> nil then gPlayer1.NoReload := not gPlayer1.NoReload;
+    if gPlayer2 <> nil then gPlayer2.NoReload := not gPlayer2.NoReload;
+    goto Cheated;
+  end;
+  if CheckCheat(I_GAME_CHEAT_AIMLINE) then
+  begin
+    gAimLine := not gAimLine;
+    goto Cheated;
+  end;
+  if CheckCheat(I_GAME_CHEAT_AUTOMAP) then
+  begin
+    gShowMap := not gShowMap;
+    goto Cheated;
+  end;
+  Exit;
+
+Cheated:
+  g_Sound_PlayEx(s);

 end;
 
 
 end;
 
 

-// ////////////////////////////////////////////////////////////////////////// //
+procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}

 var
 var

-  profileFrameDraw: TProfiler = nil;
+  Msg: g_gui.TMessage;
+{$ENDIF}
+begin
+{$IFNDEF HEADLESS}
+  case K of
+    VK_ESCAPE: // <Esc>:
+      begin
+        if (g_ActiveWindow <> nil) then
+        begin
+          Msg.Msg := WM_KEYDOWN;
+          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
+        else if (gState <> STATE_FOLD) then
+        begin
+          if gGameOn or (gState = STATE_INTERSINGLE) or (gState = STATE_INTERCUSTOM) then
+          begin
+            g_Game_InGameMenu(True);
+          end
+          else if (gExit = 0) and (gState <> STATE_SLIST) then
+          begin
+            if (gState <> STATE_MENU) then
+            begin
+              if (NetMode <> NET_NONE) then
+              begin
+                g_Game_StopAllSounds(True);
+                g_Game_Free;
+                gState := STATE_MENU;
+                Exit;
+              end;
+            end;
+            g_GUI_ShowWindow('MainMenu');
+            g_Sound_PlayEx('MENU_OPEN');
+          end;
+        end;
+      end;

 
 

+    IK_F2, IK_F3, IK_F4, IK_F5, IK_F6, IK_F7, IK_F10:
+      begin // <F2> .. <F6> � <F12>
+        if gGameOn and (not gConsoleShow) and (not gChatShow) then
+        begin
+          while (g_ActiveWindow <> nil) do g_GUI_HideWindow(False);
+          if (not g_Game_IsNet) then g_Game_Pause(True);
+          case K of
+            IK_F2: g_Menu_Show_SaveMenu();
+            IK_F3: g_Menu_Show_LoadMenu();
+            IK_F4: g_Menu_Show_GameSetGame();
+            IK_F5: g_Menu_Show_OptionsVideo();
+            IK_F6: g_Menu_Show_OptionsSound();
+            IK_F7: g_Menu_Show_EndGameMenu();
+            IK_F10: g_Menu_Show_QuitGameMenu();
+          end;
+        end;
+      end;

 
 

-// ////////////////////////////////////////////////////////////////////////// //
-type
-  TDynLight = record
-    x, y, radius: Integer;
-    r, g, b, a: Single;
-    exploCount: Integer;
-    exploRadius: Integer;
+    else
+      begin
+        gJustChatted := False;
+        if gConsoleShow or gChatShow then
+        begin
+          g_Console_Control(K);
+        end
+        else if (g_ActiveWindow <> nil) then
+        begin
+          Msg.Msg := WM_KEYDOWN;
+          Msg.WParam := K;
+          g_ActiveWindow.OnMessage(Msg);
+        end
+        else if (gState = STATE_MENU) then
+        begin
+          g_GUI_ShowWindow('MainMenu');
+          g_Sound_PlayEx('MENU_OPEN');
+        end;
+      end;

   end;
   end;

+{$ENDIF}
+end;

 
 

+procedure CharPress (C: AnsiChar);

 var
 var

-  g_dynLights: array of TDynLight = nil;
-  g_dynLightCount: Integer = 0;
-  g_playerLight: Boolean = false;
+  Msg: g_gui.TMessage;
+  a: Integer;
+begin
+  if gConsoleShow or gChatShow then
+  begin
+    g_Console_Char(C)
+  end
+  else if (g_ActiveWindow <> nil) then
+  begin
+    Msg.Msg := WM_CHAR;
+    Msg.WParam := Ord(C);
+    g_ActiveWindow.OnMessage(Msg);
+  end
+  else
+  begin
+    for a := 0 to 14 do charbuff[a] := charbuff[a+1];
+    charbuff[15] := upcase1251(C);
+    Cheat();
+  end;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function gPause (): Boolean; inline; begin result := gPauseMain or gPauseHolmes; end;

 
 procedure g_ResetDynlights ();
 var
 
 procedure g_ResetDynlights ();
 var


@@ -433,74 +854,22 @@ begin
   Inc(g_dynLightCount);
 end;
 
   Inc(g_dynLightCount);
 end;
 

-

 // ////////////////////////////////////////////////////////////////////////// //
 // ////////////////////////////////////////////////////////////////////////// //

-function calcProfilesHeight (prof: TProfiler): Integer;
-begin
-  result := 0;
-  if (prof = nil) then exit;
-  if (length(prof.bars) = 0) then exit;
-  result := length(prof.bars)*(16+2);
-end;
-
-// returns width
-function drawProfiles (x, y: Integer; prof: TProfiler): Integer;
-var
-  wdt, hgt: Integer;
-  yy: Integer;
-  ii: Integer;
+function conIsCheatsEnabled (): Boolean; inline;

 begin
 begin

-  result := 0;
-  if (prof = nil) then exit;
-  // gScreenWidth
-  if (length(prof.bars) = 0) then exit;
-  wdt := 192;
-  hgt := calcProfilesHeight(prof);
-  if (x < 0) then x := gScreenWidth-(wdt-1)+x;
-  if (y < 0) then y := gScreenHeight-(hgt-1)+y;
-  // background
-  //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 255, 255, 255, 200, B_BLEND);
-  //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE);
-  e_DarkenQuadWH(x, y, wdt, hgt, 150);
-  // title
-  yy := y+2;
-  for ii := 0 to High(prof.bars) do
-  begin
-    e_TextureFontPrintEx(x+2+4*prof.bars[ii].level, yy, Format('%s: %d', [prof.bars[ii].name, prof.bars[ii].value]), gStdFont, 255, 255, 0, 1, false);
-    Inc(yy, 16+2);
-  end;
-  result := wdt;
+  result := false;
+  if g_Game_IsNet then exit;
+  if not gDebugMode then
+  begin
+    //if not gCheats then exit;
+    if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit;
+    if not (gGameSettings.GameMode in [GM_COOP, GM_SINGLE]) then exit;
+  end;
+  result := true;

 end;
 
 end;
 

-

 // ////////////////////////////////////////////////////////////////////////// //
 type
 // ////////////////////////////////////////////////////////////////////////// //
 type

-  TEndCustomGameStat = record
-    PlayerStat: TPlayerStatArray;
-    TeamStat: TTeamStat;
-    GameTime: LongWord;
-    GameMode: Byte;
-    Map, MapName: String;
-  end;
-
-  TEndSingleGameStat = record
-    PlayerStat: Array [0..1] of record
-      Kills: Integer;
-      Secrets: Integer;
-    end;
-    GameTime: LongWord;
-    TwoPlayers: Boolean;
-    TotalSecrets: Integer;
-  end;
-
-  TLoadingStat = record
-    CurValue: Integer;
-    MaxValue: Integer;
-    ShowCount: Integer;
-    Msgs: Array of String;
-    NextMsg: Word;
-  end;
-

   TParamStrValue = record
     Name: String;
     Value: String;
   TParamStrValue = record
     Name: String;
     Value: String;


@@ -514,42 +883,22 @@ const
   INTER_ACTION_MUSIC = 3;
 
 var
   INTER_ACTION_MUSIC = 3;
 
 var

-  FPS, UPS: Word;
-  FPSCounter, UPSCounter: Word;
-  FPSTime, UPSTime: LongWord;
+  UPSCounter: Word;
+  UPSTime: LongWord;

   DataLoaded: Boolean = False;
   DataLoaded: Boolean = False;

-  LastScreenShot: Int64;
-  IsDrawStat: Boolean = False;
-  CustomStat: TEndCustomGameStat;
-  SingleStat: TEndSingleGameStat;
-  LoadingStat: TLoadingStat;
-  EndingGameCounter: Byte = 0;
-  MessageText: String;

   MessageTime: Word;
   MessageTime: Word;

-  MapList: SArray = nil;
+  MessageLineLength: Integer = 80;
+  MapList: SSArray = nil;

   MapIndex: Integer = -1;
   MapIndex: Integer = -1;

+  InterReadyTime: Integer = -1;
+  StatDate: string = '';

   MegaWAD: record
     info: TMegaWADInfo;
     endpic: String;
     endmus: String;
   MegaWAD: record
     info: TMegaWADInfo;
     endpic: String;
     endmus: String;

-    res: record
-      text: Array of ShortString;
-      anim: Array of ShortString;
-      pic: Array of ShortString;
-      mus: Array of ShortString;
-    end;
-    triggers: Array of record
-      event: ShortString;
-      actions: Array of record
-        action, p1, p2: Integer;
-      end;
-    end;
-    cur_trigger: Integer;
-    cur_action: Integer;

   end;
   end;

-  //InterPic: String;

   InterText: record
   InterText: record

-    lines: SArray;
+    lines: SSArray;

     img: String;
     cur_line: Integer;
     cur_char: Integer;
     img: String;
     cur_line: Integer;
     cur_char: Integer;


@@ -586,6 +935,68 @@ begin
       end;
 end;
 
       end;
 end;
 

+// saves a shitty CSV containing the game stats passed to it
+procedure SaveGameStat(Stat: TEndCustomGameStat; Path: string);
+var 
+  s: TextFile;
+  dir, fname, map, mode, etime: String;
+  I: Integer;
+begin
+  try
+    dir := e_GetWriteableDir(StatsDirs);
+    // stats are placed in stats/yy/mm/dd/*.csv
+    fname := e_CatPath(dir, Path);
+    ForceDirectories(fname); // ensure yy/mm/dd exists within the stats dir
+    fname := e_CatPath(fname, StatFilename + '.csv');
+    AssignFile(s, fname);
+    try
+      Rewrite(s);
+      // line 1: stats ver, datetime, server name, map name, game mode, time limit, score limit, dmflags, game time, num players
+      if g_Game_IsNet then fname := NetServerName else fname := '';
+      map := g_ExtractWadNameNoPath(gMapInfo.Map) + ':/' + g_ExtractFileName(gMapInfo.Map);
+      mode := g_Game_ModeToText(Stat.GameMode);
+      etime := Format('%d:%.2d:%.2d', [
+        Stat.GameTime div 1000 div 3600,
+        (Stat.GameTime div 1000 div 60) mod 60,
+        Stat.GameTime div 1000 mod 60
+      ]);
+      WriteLn(s, 'stats_ver,datetime,server,map,mode,timelimit,scorelimit,dmflags,time,num_players');
+      WriteLn(s, Format('%d,%s,%s,%s,%s,%u,%u,%u,%s,%d', [
+        STATFILE_VERSION,
+        StatDate,
+        dquoteStr(fname),
+        dquoteStr(map),
+        mode,
+        gGameSettings.TimeLimit,
+        gGameSettings.GoalLimit,
+        gGameSettings.Options,
+        etime,
+        Length(Stat.PlayerStat)
+      ]));
+      // line 2: game specific shit
+      //   if it's a team game: red score, blue score
+      //   if it's a coop game: monsters killed, monsters total, secrets found, secrets total
+      //   otherwise nothing
+      if Stat.GameMode in [GM_TDM, GM_CTF] then
+        WriteLn(s, 
+          Format('red_score,blue_score' + LineEnding + '%d,%d', [Stat.TeamStat[TEAM_RED].Goals, Stat.TeamStat[TEAM_BLUE].Goals]))
+      else if Stat.GameMode in [GM_COOP, GM_SINGLE] then
+        WriteLn(s,
+          Format('mon_killed,mon_total,secrets_found,secrets_total' + LineEnding + '%d,%d,%d,%d',[gCoopMonstersKilled, gTotalMonsters, gCoopSecretsFound, gSecretsCount]));
+      // lines 3-...: team, player name, frags, deaths
+      WriteLn(s, 'team,name,frags,deaths');
+      for I := Low(Stat.PlayerStat) to High(Stat.PlayerStat) do
+        with Stat.PlayerStat[I] do
+          WriteLn(s, Format('%d,%s,%d,%d', [Team, dquoteStr(Name), Frags, Deaths]));
+    except
+      g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [fname]));
+    end;
+  except
+    g_Console_Add('could not create gamestats file "' + fname + '"');
+  end;
+  CloseFile(s);
+end;
+

 function g_Game_ModeToText(Mode: Byte): string;
 begin
   Result := '';
 function g_Game_ModeToText(Mode: Byte): string;
 begin
   Result := '';


@@ -674,48 +1085,31 @@ begin
   FreeMem(p);
 end;
 
   FreeMem(p);
 end;
 

-procedure g_Game_FreeWAD();
-var
-  a: Integer;
-begin
-  for a := 0 to High(MegaWAD.res.pic) do
-    if MegaWAD.res.pic[a] <> '' then
-      g_Texture_Delete(MegaWAD.res.pic[a]);
-
-  for a := 0 to High(MegaWAD.res.mus) do
-    if MegaWAD.res.mus[a] <> '' then
-      g_Sound_Delete(MegaWAD.res.mus[a]);
-
-  MegaWAD.res.pic := nil;
-  MegaWAD.res.text := nil;
-  MegaWAD.res.anim := nil;
-  MegaWAD.res.mus := nil;
-  MegaWAD.triggers := nil;
-
-  g_Texture_Delete('TEXTURE_endpic');
-  g_Sound_Delete('MUSIC_endmus');
-
-  ZeroMemory(@MegaWAD, SizeOf(MegaWAD));
-  gGameSettings.WAD := '';
-end;
+  procedure g_Game_FreeWAD;
+  begin
+    EndPicPath := '';
+    g_Sound_Delete('MUSIC_endmus');
+    ZeroMemory(@MegaWAD, SizeOf(MegaWAD));
+    gGameSettings.WAD := '';
+  end;

 
 procedure g_Game_LoadWAD(WAD: string);
 var
   w: TWADFile;
   cfg: TConfig;
   p: Pointer;
 
 procedure g_Game_LoadWAD(WAD: string);
 var
   w: TWADFile;
   cfg: TConfig;
   p: Pointer;

-  {b, }len: Integer;
-  s: string;
+  len: Integer;
+  s: AnsiString;

 begin
   g_Game_FreeWAD();
   gGameSettings.WAD := WAD;
   if not (gGameSettings.GameMode in [GM_COOP, GM_SINGLE]) then
     Exit;
 
 begin
   g_Game_FreeWAD();
   gGameSettings.WAD := WAD;
   if not (gGameSettings.GameMode in [GM_COOP, GM_SINGLE]) then
     Exit;
 

-  MegaWAD.info := g_Game_GetMegaWADInfo(MapsDir + WAD);
+  MegaWAD.info := g_Game_GetMegaWADInfo(WAD);

 
   w := TWADFile.Create();
 
   w := TWADFile.Create();

-  w.ReadFile(MapsDir + WAD);
+  w.ReadFile(WAD);

 
   if not w.GetResource('INTERSCRIPT', p, len) then
   begin
 
   if not w.GetResource('INTERSCRIPT', p, len) then
   begin


@@ -725,45 +1119,16 @@ begin
 
   cfg := TConfig.CreateMem(p, len);
 
 
   cfg := TConfig.CreateMem(p, len);
 

- {b := 1;
- while True do
- begin
-  s := cfg.ReadStr('pic', 'pic'+IntToStr(b), '');
-  if s = '' then Break;
-  b := b+1;
-
-  SetLength(MegaWAD.res.pic, Length(MegaWAD.res.pic)+1);
-  MegaWAD.res.pic[High(MegaWAD.res.pic)] := s;
-
-  g_Texture_CreateWADEx(s, s);
- end;
-
- b := 1;
- while True do
- begin
-  s := cfg.ReadStr('mus', 'mus'+IntToStr(b), '');
-  if s = '' then Break;
-  b := b+1;
-
-  SetLength(MegaWAD.res.mus, Length(MegaWAD.res.mus)+1);
-  MegaWAD.res.mus[High(MegaWAD.res.mus)] := s;
-
-  g_Music_CreateWADEx(s, s);
- end;}
-
+  EndPicPath := '';

   MegaWAD.endpic := cfg.ReadStr('megawad', 'endpic', '');
   if MegaWAD.endpic <> '' then
   MegaWAD.endpic := cfg.ReadStr('megawad', 'endpic', '');
   if MegaWAD.endpic <> '' then

-  begin
-    s := g_ExtractWadName(MegaWAD.endpic);
-    if s = '' then s := MapsDir+WAD else s := GameDir+'/wads/';
-    g_Texture_CreateWADEx('TEXTURE_endpic', s+MegaWAD.endpic);
-  end;
-  MegaWAD.endmus := cfg.ReadStr('megawad', 'endmus', 'Standart.wad:D2DMUS\ÊÎÍÅÖ');
+    EndPicPath := e_GetResourcePath(WadDirs, MegaWAD.endpic, WAD);
+
+  MegaWAD.endmus := cfg.ReadStr('megawad', 'endmus', 'Standart.wad:D2DMUS\КОНЕЦ');

   if MegaWAD.endmus <> '' then
   begin
   if MegaWAD.endmus <> '' then
   begin

-    s := g_ExtractWadName(MegaWAD.endmus);
-    if s = '' then s := MapsDir+WAD else s := GameDir+'/wads/';
-    g_Sound_CreateWADEx('MUSIC_endmus', s+MegaWAD.endmus, True);
+    s := e_GetResourcePath(WadDirs, MegaWAD.endmus, WAD);
+    g_Sound_CreateWADEx('MUSIC_endmus', s, True);

   end;
 
   cfg.Free();
   end;
 
   cfg.Free();


@@ -792,7 +1157,7 @@ begin
 
   {$IF DEFINED(D2F_DEBUG)}
   if gPlayer1 <> nil then gPlayer1.NoTarget := True;
 
   {$IF DEFINED(D2F_DEBUG)}
   if gPlayer1 <> nil then gPlayer1.NoTarget := True;

-  gAimLine := true;
+  gAimLine := g_dbg_aimline_on;

   {$ENDIF}
 end;
 
   {$ENDIF}
 end;
 


@@ -835,7 +1200,7 @@ begin
   gDelayedEvents[n].DENum := Num;
   gDelayedEvents[n].DEStr := Str;
   if DEType = DE_GLOBEVENT then
   gDelayedEvents[n].DENum := Num;
   gDelayedEvents[n].DEStr := Str;
   if DEType = DE_GLOBEVENT then

-    gDelayedEvents[n].Time := (GetTimer() {div 1000}) + Time
+    gDelayedEvents[n].Time := (GetTickCount64() {div 1000}) + Time

   else
     gDelayedEvents[n].Time := gTime + Time;
   Result := n;
   else
     gDelayedEvents[n].Time := gTime + Time;
   Result := n;


@@ -845,13 +1210,15 @@ procedure EndGame();
 var
   a: Integer;
   FileName: string;
 var
   a: Integer;
   FileName: string;

+  t: TDateTime;

 begin
   if g_Game_IsNet and g_Game_IsServer then
     MH_SEND_GameEvent(NET_EV_MAPEND, Byte(gMissionFailed));
 
 begin
   if g_Game_IsNet and g_Game_IsServer then
     MH_SEND_GameEvent(NET_EV_MAPEND, Byte(gMissionFailed));
 

-// Ñòîï èãðà:
-  gPause := False;
-  gGameOn := False;
+// Стоп игра:
+  gPauseMain := false;
+  gPauseHolmes := false;
+  gGameOn := false;

 
   g_Game_StopAllSounds(False);
 
 
   g_Game_StopAllSounds(False);
 


@@ -865,16 +1232,16 @@ begin
   gLMSRespawnTime := 0;
 
   case gExit of
   gLMSRespawnTime := 0;
 
   case gExit of

-    EXIT_SIMPLE: // Âûõîä ÷åðåç ìåíþ èëè êîíåö òåñòà
+    EXIT_SIMPLE: // Выход через меню или конец теста

       begin
         g_Game_Free();
 
         if gMapOnce  then
       begin
         g_Game_Free();
 
         if gMapOnce  then

-          begin // Ýòî áûë òåñò
+          begin // Это был тест

             g_Game_Quit();
           end
         else
             g_Game_Quit();
           end
         else

-          begin // Âûõîä â ãëàâíîå ìåíþ
+          begin // Выход в главное меню

             gMusic.SetByName('MUSIC_MENU');
             gMusic.Play();
             if gState <> STATE_SLIST then
             gMusic.SetByName('MUSIC_MENU');
             gMusic.Play();
             if gState <> STATE_SLIST then


@@ -883,7 +1250,7 @@ begin
               gState := STATE_MENU;
             end else
             begin
               gState := STATE_MENU;
             end else
             begin

-              // Îáíîâëÿåì ñïèñîê ñåðâåðîâ
+              // Обновляем список серверов

               slReturnPressed := True;
               if g_Net_Slist_Fetch(slCurrent) then
               begin
               slReturnPressed := True;
               if g_Net_Slist_Fetch(slCurrent) then
               begin


@@ -892,20 +1259,21 @@ begin
               end
               else
                 slWaitStr := _lc[I_NET_SLIST_ERROR];
               end
               else
                 slWaitStr := _lc[I_NET_SLIST_ERROR];

+              g_Serverlist_GenerateTable(slCurrent, slTable);

             end;
 
             g_Game_ExecuteEvent('ongameend');
           end;
       end;
 
             end;
 
             g_Game_ExecuteEvent('ongameend');
           end;
       end;
 

-    EXIT_RESTART: // Íà÷àòü óðîâåíü ñíà÷àëà
+    EXIT_RESTART: // Начать уровень сначала

       begin
         if not g_Game_IsClient then g_Game_Restart();
       end;
 
       begin
         if not g_Game_IsClient then g_Game_Restart();
       end;
 

-    EXIT_ENDLEVELCUSTOM: // Çàêîí÷èëñÿ óðîâåíü â Ñâîåé èãðå
+    EXIT_ENDLEVELCUSTOM: // Закончился уровень в Своей игре

       begin
       begin

-      // Ñòàòèñòèêà Ñâîåé èãðû:
+      // Статистика Своей игры:

         FileName := g_ExtractWadName(gMapInfo.Map);
 
         CustomStat.GameTime := gTime;
         FileName := g_ExtractWadName(gMapInfo.Map);
 
         CustomStat.GameTime := gTime;


@@ -917,7 +1285,7 @@ begin
 
         CustomStat.PlayerStat := nil;
 
 
         CustomStat.PlayerStat := nil;
 

-      // Ñòàòèñòèêà èãðîêîâ:
+      // Статистика игроков:

         if gPlayers <> nil then
         begin
           for a := 0 to High(gPlayers) do
         if gPlayers <> nil then
         begin
           for a := 0 to High(gPlayers) do


@@ -926,6 +1294,7 @@ begin
               SetLength(CustomStat.PlayerStat, Length(CustomStat.PlayerStat)+1);
               with CustomStat.PlayerStat[High(CustomStat.PlayerStat)] do
               begin
               SetLength(CustomStat.PlayerStat, Length(CustomStat.PlayerStat)+1);
               with CustomStat.PlayerStat[High(CustomStat.PlayerStat)] do
               begin

+                Num := a;

                 Name := gPlayers[a].Name;
                 Frags := gPlayers[a].Frags;
                 Deaths := gPlayers[a].Death;
                 Name := gPlayers[a].Name;
                 Frags := gPlayers[a].Frags;
                 Deaths := gPlayers[a].Death;


@@ -937,11 +1306,26 @@ begin
             end;
 
           SortGameStat(CustomStat.PlayerStat);
             end;
 
           SortGameStat(CustomStat.PlayerStat);

+
+          if (gSaveStats or gScreenshotStats) and (Length(CustomStat.PlayerStat) > 1) then
+          begin
+            t := Now;
+            if g_Game_IsNet then StatFilename := NetServerName else StatFilename := 'local';
+            StatDate := FormatDateTime('yymmdd_hhnnss', t);
+            StatFilename := StatFilename + '_' + CustomStat.Map + '_' + g_Game_ModeToText(CustomStat.GameMode);
+            StatFilename := sanitizeFilename(StatFilename) + '_' + StatDate;
+            if gSaveStats then
+              SaveGameStat(CustomStat, FormatDateTime('yyyy"/"mm"/"dd', t));
+          end;
+
+          StatShotDone := False;

         end;
 
         g_Game_ExecuteEvent('onmapend');
         end;
 
         g_Game_ExecuteEvent('onmapend');

+        if not g_Game_IsClient then g_Player_ResetReady;
+        gInterReadyCount := 0;

 
 

-      // Çàòóõàþùèé ýêðàí:
+      // Затухающий экран:

         EndingGameCounter := 255;
         gState := STATE_FOLD;
         gInterTime := 0;
         EndingGameCounter := 255;
         gState := STATE_FOLD;
         gInterTime := 0;


@@ -951,16 +1335,16 @@ begin
           gInterEndTime := gDefInterTime * 1000;
       end;
 
           gInterEndTime := gDefInterTime * 1000;
       end;
 

-    EXIT_ENDLEVELSINGLE: // Çàêîí÷èëñÿ óðîâåíü â Îäèíî÷íîé èãðå
+    EXIT_ENDLEVELSINGLE: // Закончился уровень в Одиночной игре

       begin
       begin

-      // Ñòàòèñòèêà Îäèíî÷íîé èãðû:
+      // Статистика Одиночной игры:

         SingleStat.GameTime := gTime;
         SingleStat.TwoPlayers := gPlayer2 <> nil;
         SingleStat.TotalSecrets := gSecretsCount;
         SingleStat.GameTime := gTime;
         SingleStat.TwoPlayers := gPlayer2 <> nil;
         SingleStat.TotalSecrets := gSecretsCount;

-      // Ñòàòèñòèêà ïåðâîãî èãðîêà:
+      // Статистика первого игрока:

         SingleStat.PlayerStat[0].Kills := gPlayer1.MonsterKills;
         SingleStat.PlayerStat[0].Secrets := gPlayer1.Secrets;
         SingleStat.PlayerStat[0].Kills := gPlayer1.MonsterKills;
         SingleStat.PlayerStat[0].Secrets := gPlayer1.Secrets;

-      // Ñòàòèñòèêà âòîðîãî èãðîêà (åñëè åñòü):
+      // Статистика второго игрока (если есть):

         if SingleStat.TwoPlayers then
         begin
           SingleStat.PlayerStat[1].Kills := gPlayer2.MonsterKills;
         if SingleStat.TwoPlayers then
         begin
           SingleStat.PlayerStat[1].Kills := gPlayer2.MonsterKills;


@@ -969,321 +1353,68 @@ begin
 
         g_Game_ExecuteEvent('onmapend');
 
 
         g_Game_ExecuteEvent('onmapend');
 

-      // Åñòü åùå êàðòû:
+      // Есть еще карты:

         if gNextMap <> '' then
           begin
             gMusic.SetByName('MUSIC_INTERMUS');
             gMusic.Play();
             gState := STATE_INTERSINGLE;
         if gNextMap <> '' then
           begin
             gMusic.SetByName('MUSIC_INTERMUS');
             gMusic.Play();
             gState := STATE_INTERSINGLE;

+            e_UnpressAllKeys();

 
             g_Game_ExecuteEvent('oninter');
           end
 
             g_Game_ExecuteEvent('oninter');
           end

-        else // Áîëüøå íåò êàðò
+        else // Больше нет карт

           begin
           begin

-          // Çàòóõàþùèé ýêðàí:
+          // Затухающий экран:

             EndingGameCounter := 255;
             gState := STATE_FOLD;
           end;
       end;
   end;
 
             EndingGameCounter := 255;
             gState := STATE_FOLD;
           end;
       end;
   end;
 

-// Îêîí÷àíèå îáðàáîòàíî:
+// Окончание обработано:

   if gExit <> EXIT_QUIT then
     gExit := 0;
 end;
 
   if gExit <> EXIT_QUIT then
     gExit := 0;
 end;
 

-procedure drawTime(X, Y: Integer); inline;
-begin
-  e_TextureFontPrint(x, y,
-                     Format('%d:%.2d:%.2d', [
-                       gTime div 1000 div 3600,
-                       (gTime div 1000 div 60) mod 60,
-                       gTime div 1000 mod 60
-                     ]),
-                     gStdFont);
-end;
-
-procedure DrawStat();
-var
-  pc, x, y, w, h: Integer;
-  w1, w2, w3, w4: Integer;
-  a, aa: Integer;
-  cw, ch, r, g, b, rr, gg, bb: Byte;
-  s1, s2, s3: String;
-  _y: Integer;
-  stat: TPlayerStatArray;
-  wad, map: string;
-  mapstr: string;
+procedure g_Game_Init();

 begin
 begin

-  s1 := '';
-  s2 := '';
-  s3 := '';
-  pc := g_Player_GetCount;
-  e_TextureFontGetSize(gStdFont, cw, ch);
-
-  w := gScreenWidth-(gScreenWidth div 5);
-  if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
-    h := 32+ch*(11+pc)
-  else
-    h := 40+ch*5+(ch+8)*pc;
-  x := (gScreenWidth div 2)-(w div 2);
-  y := (gScreenHeight div 2)-(h div 2);
-
-  e_DrawFillQuad(x, y, x+w-1, y+h-1, 64, 64, 64, 32);
-  e_DrawQuad(x, y, x+w-1, y+h-1, 255, 127, 0);
-
-  drawTime(x+w-78, y+8);
-
-  wad := g_ExtractWadNameNoPath(gMapInfo.Map);
-  map := g_ExtractFileName(gMapInfo.Map);
-  mapstr := wad + ':\' + map + ' - ' + gMapInfo.Name;
-
-  case gGameSettings.GameMode of
-    GM_DM:
-    begin
-      if gGameSettings.MaxLives = 0 then
-        s1 := _lc[I_GAME_DM]
-      else
-        s1 := _lc[I_GAME_LMS];
-      s2 := Format(_lc[I_GAME_FRAG_LIMIT], [gGameSettings.GoalLimit]);
-      s3 := Format(_lc[I_GAME_TIME_LIMIT], [gGameSettings.TimeLimit div 3600, (gGameSettings.TimeLimit div 60) mod 60, gGameSettings.TimeLimit mod 60]);
-    end;
+  gExit := 0;
+  gMapToDelete := '';
+  gTempDelete := False;

 
 

-    GM_TDM:
-    begin
-      if gGameSettings.MaxLives = 0 then
-        s1 := _lc[I_GAME_TDM]
-      else
-        s1 := _lc[I_GAME_TLMS];
-      s2 := Format(_lc[I_GAME_FRAG_LIMIT], [gGameSettings.GoalLimit]);
-      s3 := Format(_lc[I_GAME_TIME_LIMIT], [gGameSettings.TimeLimit div 3600, (gGameSettings.TimeLimit div 60) mod 60, gGameSettings.TimeLimit mod 60]);
-    end;
+  sfsGCDisable(); // temporary disable removing of temporary volumes

 
 

-    GM_CTF:
-    begin
-      s1 := _lc[I_GAME_CTF];
-      s2 := Format(_lc[I_GAME_SCORE_LIMIT], [gGameSettings.GoalLimit]);
-      s3 := Format(_lc[I_GAME_TIME_LIMIT], [gGameSettings.TimeLimit div 3600, (gGameSettings.TimeLimit div 60) mod 60, gGameSettings.TimeLimit mod 60]);
-    end;
+  try
+    g_Game_ClearLoading();
+    g_Game_SetLoadingText(Format('Doom 2D: Forever %s', [GAME_VERSION]), 0, False);
+    g_Game_SetLoadingText('', 0, False);

 
 

-    GM_COOP:
-    begin
-      if gGameSettings.MaxLives = 0 then
-        s1 := _lc[I_GAME_COOP]
-      else
-        s1 := _lc[I_GAME_SURV];
-      s2 := _lc[I_GAME_MONSTERS] + ' ' + IntToStr(gCoopMonstersKilled) + '/' + IntToStr(gTotalMonsters);
-      s3 := _lc[I_GAME_SECRETS] + ' ' + IntToStr(gCoopSecretsFound) + '/' + IntToStr(gSecretsCount);
-    end;
+//    g_Game_SetLoadingText(_lc[I_LOAD_MODELS], 0, False);

 
 

-    else
-    begin
-      s1 := '';
-      s2 := '';
-    end;
-  end;
+    gGameOn := false;
+    gPauseMain := false;
+    gPauseHolmes := false;
+    gTime := 0;

 
 

-  _y := y+8;
-  e_TextureFontPrintEx(x+(w div 2)-(Length(s1)*cw div 2), _y, s1, gStdFont, 255, 255, 255, 1);
-  _y := _y+ch+8;
-  e_TextureFontPrintEx(x+(w div 2)-(Length(mapstr)*cw div 2), _y, mapstr, gStdFont, 200, 200, 200, 1);
-  _y := _y+ch+8;
-  e_TextureFontPrintEx(x+16, _y, s2, gStdFont, 200, 200, 200, 1);
+    {e_MouseInfo.Accel := 1.0;}

 
 

-  e_TextureFontPrintEx(x+w-16-(Length(s3))*cw, _y, s3,
-                       gStdFont, 200, 200, 200, 1);
+    g_Game_SetLoadingText(_lc[I_LOAD_GAME_DATA], 0, False);
+    g_Game_LoadData();

 
 

-  if NetMode = NET_SERVER then
-    e_TextureFontPrintEx(x+8, y + 8, _lc[I_NET_SERVER], gStdFont, 255, 255, 255, 1)
-  else
-    if NetMode = NET_CLIENT then
-      e_TextureFontPrintEx(x+8, y + 8,
-        NetClientIP + ':' + IntToStr(NetClientPort), gStdFont, 255, 255, 255, 1);
+    g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
+    g_Sound_CreateWADEx('MUSIC_INTERMUS', GameWAD+':MUSIC\INTERMUS', True);
+    g_Sound_CreateWADEx('MUSIC_MENU', GameWAD+':MUSIC\MENU', True);
+    g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True, True);
+    g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);

 
 

-  if pc = 0 then
-    Exit;
-  stat := g_Player_GetStats();
-  SortGameStat(stat);
+    gMusic := TMusic.Create();
+    gMusic.SetByName('MUSIC_MENU');
+    gMusic.Play();

 
 

-  w2 := (w-16) div 6 + 48; // øèðèíà 2 ñòîëáöà
-  w3 := (w-16) div 6; // øèðèíà 3 è 4 ñòîëáöîâ
-  w4 := w3;
-  w1 := w-16-w2-w3-w4; // îñòàâøååñÿ ïðîñòðàíñòâî - äëÿ öâåòà è èìåíè èãðîêà
+    gGameSettings.WarmupTime := 30;

 
 

-  if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
-  begin
-    _y := _y+ch+ch;
-
-    for a := TEAM_RED to TEAM_BLUE do
-    begin
-      if a = TEAM_RED then
-      begin
-        s1 := _lc[I_GAME_TEAM_RED];
-        r := 255;
-        g := 0;
-        b := 0;
-      end
-      else
-      begin
-        s1 := _lc[I_GAME_TEAM_BLUE];
-        r := 0;
-        g := 0;
-        b := 255;
-      end;
-
-      e_TextureFontPrintEx(x+16, _y, s1, gStdFont, r, g, b, 1);
-      e_TextureFontPrintEx(x+w1+16, _y, IntToStr(gTeamStat[a].Goals),
-                           gStdFont, r, g, b, 1);
-
-      _y := _y+ch+(ch div 4);
-      e_DrawLine(1, x+16, _y, x+w-16, _y, r, g, b);
-      _y := _y+(ch div 4);
-
-      for aa := 0 to High(stat) do
-        if stat[aa].Team = a then
-          with stat[aa] do
-          begin
-            if Spectator then
-            begin
-              rr := r div 2;
-              gg := g div 2;
-              bb := b div 2;
-            end
-            else
-            begin
-              rr := r;
-              gg := g;
-              bb := b;
-            end;
-            // Èìÿ
-            e_TextureFontPrintEx(x+16, _y, Name, gStdFont, rr, gg, bb, 1);
-            // Ïèíã/ïîòåðè
-            e_TextureFontPrintEx(x+w1+16, _y, Format(_lc[I_GAME_PING_MS], [Ping, Loss]), gStdFont, rr, gg, bb, 1);
-            // Ôðàãè
-            e_TextureFontPrintEx(x+w1+w2+16, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
-            // Ñìåðòè
-            e_TextureFontPrintEx(x+w1+w2+w3+16, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
-            _y := _y+ch;
-          end;
-
-          _y := _y+ch;
-    end;
-  end
-  else if gGameSettings.GameMode in [GM_DM, GM_COOP] then
-  begin
-    _y := _y+ch+ch;
-    e_TextureFontPrintEx(x+16, _y, _lc[I_GAME_PLAYER_NAME], gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+16+w1, _y, _lc[I_GAME_PING], gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+16+w1+w2, _y, _lc[I_GAME_FRAGS], gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+16+w1+w2+w3, _y, _lc[I_GAME_DEATHS], gStdFont, 255, 127, 0, 1);
-
-    _y := _y+ch+8;
-    for aa := 0 to High(stat) do
-      with stat[aa] do
-      begin
-        if Spectator then
-        begin
-          r := 127;
-          g := 64;
-        end
-        else
-        begin
-          r := 255;
-          g := 127;
-        end;
-        // Öâåò èãðîêà
-        e_DrawFillQuad(x+16, _y+4, x+32-1, _y+16+4-1, Color.R, Color.G, Color.B, 0);
-        e_DrawQuad(x+16, _y+4, x+32-1, _y+16+4-1, 192, 192, 192);
-        // Èìÿ
-        e_TextureFontPrintEx(x+16+16+8, _y+4, Name, gStdFont, r, g, 0, 1);
-        // Ïèíã/ïîòåðè
-        e_TextureFontPrintEx(x+w1+16, _y+4, Format(_lc[I_GAME_PING_MS], [Ping, Loss]), gStdFont, r, g, 0, 1);
-        // Ôðàãè
-        e_TextureFontPrintEx(x+w1+w2+16, _y+4, IntToStr(Frags), gStdFont, r, g, 0, 1);
-        // Ñìåðòè
-        e_TextureFontPrintEx(x+w1+w2+w3+16, _y+4, IntToStr(Deaths), gStdFont, r, g, 0, 1);
-        _y := _y+ch+8;
-      end;
-  end
-end;
-
-procedure g_Game_Init();
-var
-  SR: TSearchRec;
-begin
-  gExit := 0;
-  gMapToDelete := '';
-  gTempDelete := False;
-
-  sfsGCDisable(); // temporary disable removing of temporary volumes
-
-  try
-    g_Texture_CreateWADEx('MENU_BACKGROUND', GameWAD+':TEXTURES\TITLE');
-    g_Texture_CreateWADEx('INTER', GameWAD+':TEXTURES\INTER');
-    g_Texture_CreateWADEx('ENDGAME_EN', GameWAD+':TEXTURES\ENDGAME_EN');
-    g_Texture_CreateWADEx('ENDGAME_RU', GameWAD+':TEXTURES\ENDGAME_RU');
-
-    LoadStdFont('STDTXT', 'STDFONT', gStdFont);
-    LoadFont('MENUTXT', 'MENUFONT', gMenuFont);
-    LoadFont('SMALLTXT', 'SMALLFONT', gMenuSmallFont);
-
-    g_Game_ClearLoading();
-    g_Game_SetLoadingText(Format('Doom 2D: Forever %s', [GAME_VERSION]), 0, False);
-    g_Game_SetLoadingText('', 0, False);
-
-    g_Game_SetLoadingText(_lc[I_LOAD_CONSOLE], 0, False);
-    g_Console_Init();
-
-    g_Game_SetLoadingText(_lc[I_LOAD_MODELS], 0, False);
-    g_PlayerModel_LoadData();
-
-    if FindFirst(ModelsDir+'*.wad', faAnyFile, SR) = 0 then
-      repeat
-        if not g_PlayerModel_Load(ModelsDir+SR.Name) then
-          e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
-      until FindNext(SR) <> 0;
-    FindClose(SR);
-
-    if FindFirst(ModelsDir+'*.pk3', faAnyFile, SR) = 0 then
-      repeat
-        if not g_PlayerModel_Load(ModelsDir+SR.Name) then
-          e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
-      until FindNext(SR) <> 0;
-    FindClose(SR);
-
-    if FindFirst(ModelsDir+'*.zip', faAnyFile, SR) = 0 then
-      repeat
-        if not g_PlayerModel_Load(ModelsDir+SR.Name) then
-          e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
-      until FindNext(SR) <> 0;
-    FindClose(SR);
-
-    gGameOn := False;
-    gPause := False;
-    gTime := 0;
-    LastScreenShot := 0;
-
-    {e_MouseInfo.Accel := 1.0;}
-
-    g_Game_SetLoadingText(_lc[I_LOAD_GAME_DATA], 0, False);
-    g_Game_LoadData();
-
-    g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
-    g_Sound_CreateWADEx('MUSIC_INTERMUS', GameWAD+':MUSIC\INTERMUS', True);
-    g_Sound_CreateWADEx('MUSIC_MENU', GameWAD+':MUSIC\MENU', True);
-    g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True);
-    g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
-
-    g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);
-    g_Menu_Init();
-
-    gMusic := TMusic.Create();
-    gMusic.SetByName('MUSIC_MENU');
-    gMusic.Play();
-
-    gGameSettings.WarmupTime := 30;
-
-    gState := STATE_MENU;
+    gState := STATE_MENU;

 
     SetLength(gEvents, 6);
     gEvents[0].Name := 'ongamestart';
 
     SetLength(gEvents, 6);
     gEvents[0].Name := 'ongamestart';


@@ -1297,12 +1428,12 @@ begin
   end;
 end;
 
   end;
 end;
 

-procedure g_Game_Free();
+procedure g_Game_Free(freeTextures: Boolean=true);

 begin
   if NetMode = NET_CLIENT then g_Net_Disconnect();
   if NetMode = NET_SERVER then g_Net_Host_Die();
 
 begin
   if NetMode = NET_CLIENT then g_Net_Disconnect();
   if NetMode = NET_SERVER then g_Net_Host_Die();
 

-  g_Map_Free();
+  g_Map_Free(freeTextures);

   g_Player_Free();
   g_Player_RemoveAllCorpses();
 
   g_Player_Free();
   g_Player_RemoveAllCorpses();
 


@@ -1323,26 +1454,33 @@ begin
   Result := (not p.FDummy) and (not p.FSpectator);
 end;
 
   Result := (not p.FDummy) and (not p.FSpectator);
 end;
 

-function GetActivePlayer_ByID(ID: Integer): TPlayer;
+function GetActivePlayerID_Next(Skip: Integer = -1): Integer;

 var
 var

-  a: Integer;
+  a, idx: Integer;
+  ids: Array of Word;

 begin
 begin

-  Result := nil;
-  if ID < 0 then
-    Exit;
+  Result := -1;

   if gPlayers = nil then
     Exit;
   if gPlayers = nil then
     Exit;

+  SetLength(ids, 0);
+  idx := -1;

   for a := Low(gPlayers) to High(gPlayers) do
     if IsActivePlayer(gPlayers[a]) then
     begin
   for a := Low(gPlayers) to High(gPlayers) do
     if IsActivePlayer(gPlayers[a]) then
     begin

-      if gPlayers[a].UID <> ID then
-        continue;
-      Result := gPlayers[a];
-      break;
+      SetLength(ids, Length(ids) + 1);
+      ids[High(ids)] := gPlayers[a].UID;
+      if gPlayers[a].UID = Skip then
+        idx := High(ids);

     end;
     end;

+  if Length(ids) = 0 then
+    Exit;
+  if idx = -1 then
+    Result := ids[0]
+  else
+    Result := ids[(idx + 1) mod Length(ids)];

 end;
 
 end;
 

-function GetActivePlayerID_Next(Skip: Integer = -1): Integer;
+function GetActivePlayerID_Prev(Skip: Integer = -1): Integer;

 var
   a, idx: Integer;
   ids: Array of Word;
 var
   a, idx: Integer;
   ids: Array of Word;


@@ -1363,12 +1501,12 @@ begin
   if Length(ids) = 0 then
     Exit;
   if idx = -1 then
   if Length(ids) = 0 then
     Exit;
   if idx = -1 then

-    Result := ids[0]
+    Result := ids[Length(ids) - 1]

   else
   else

-    Result := ids[(idx + 1) mod Length(ids)];
+    Result := ids[(Length(ids) - 1 + idx) mod Length(ids)];

 end;
 
 end;
 

-function GetActivePlayerID_Prev(Skip: Integer = -1): Integer;
+function GetActivePlayerID_Random(Skip: Integer = -1): Integer;

 var
   a, idx: Integer;
   ids: Array of Word;
 var
   a, idx: Integer;
   ids: Array of Word;


@@ -1388,74 +1526,111 @@ begin
     end;
   if Length(ids) = 0 then
     Exit;
     end;
   if Length(ids) = 0 then
     Exit;

-  if idx = -1 then
-    Result := ids[Length(ids) - 1]
-  else
-    Result := ids[(Length(ids) - 1 + idx) mod Length(ids)];
+  if Length(ids) = 1 then
+  begin
+    Result := ids[0];
+    Exit;
+  end;
+  Result := ids[Random(Length(ids))];
+  a := 10;
+  while (idx <> -1) and (Result = Skip) and (a > 0) do
+  begin
+    Result := ids[Random(Length(ids))];
+    Dec(a);
+  end;

 end;
 
 end;
 

-function isKeyPressed (key1: Word; key2: Word): Boolean;
+function GetRandomSpectMode(Current: Byte): Byte;
+label
+  retry;

 begin
 begin

-  if (key1 <> 0) and e_KeyPressed(key1) then begin result := true; exit; end;
-  if (key2 <> 0) and e_KeyPressed(key2) then begin result := true; exit; end;
-  result := false;
+  Result := Current;
+retry:
+  case Random(7) of
+    0: Result := SPECT_STATS;
+    1: Result := SPECT_MAPVIEW;
+    2: Result := SPECT_MAPVIEW;
+    3: Result := SPECT_PLAYERS;
+    4: Result := SPECT_PLAYERS;
+    5: Result := SPECT_PLAYERS;
+    6: Result := SPECT_PLAYERS;
+  end;
+  if (Current in [SPECT_STATS, SPECT_MAPVIEW]) and (Current = Result) then
+    goto retry;

 end;
 
 end;
 

-procedure processPlayerControls (plr: TPlayer; var ctrl: TPlayerControl; var MoveButton: Byte; p2hack: Boolean=false);
-var
-  time: Word;
-  strafeDir: Byte;
-  i: Integer;
+procedure ProcessPlayerControls (plr: TPlayer; p: Integer; var MoveButton: Byte);
+  var
+    time: Word;
+    strafeDir: Byte;
+    i: Integer;

 begin
   if (plr = nil) then exit;
 begin
   if (plr = nil) then exit;

-  if (p2hack) then time := 1000 else time := 1;
+  if (p = 2) then time := 1000 else time := 1;

   strafeDir := MoveButton shr 4;
   MoveButton := MoveButton and $0F;
   strafeDir := MoveButton shr 4;
   MoveButton := MoveButton and $0F;

-  with ctrl do
-  begin
-         if isKeyPressed(KeyLeft, KeyLeft2) and (not isKeyPressed(KeyRight, KeyRight2)) then MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî"
-    else if (not isKeyPressed(KeyLeft, KeyLeft2)) and isKeyPressed(KeyRight, KeyRight2) then MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî"
-    else if (not isKeyPressed(KeyLeft, KeyLeft2)) and (not isKeyPressed(KeyRight, KeyRight2)) then MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî"

 
 

-    // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó:
-         if MoveButton = 1 then plr.PressKey(KEY_LEFT, time)
-    else if MoveButton = 2 then plr.PressKey(KEY_RIGHT, time);
+  if gPlayerAction[p, ACTION_MOVELEFT] and (not gPlayerAction[p, ACTION_MOVERIGHT]) then
+    MoveButton := 1 // Нажата только "Влево"
+  else if (not gPlayerAction[p, ACTION_MOVELEFT]) and gPlayerAction[p, ACTION_MOVERIGHT] then
+    MoveButton := 2 // Нажата только "Вправо"
+  else if (not gPlayerAction[p, ACTION_MOVELEFT]) and (not gPlayerAction[p, ACTION_MOVERIGHT]) then
+    MoveButton := 0; // Не нажаты ни "Влево", ни "Вправо"
+
+  // Сейчас или раньше были нажаты "Влево"/"Вправо" => передаем игроку:
+  if MoveButton = 1 then
+    plr.PressKey(KEY_LEFT, time)
+  else if MoveButton = 2 then
+    plr.PressKey(KEY_RIGHT, time);
+
+  // if we have "strafe" key, turn off old strafe mechanics
+  if gPlayerAction[p, ACTION_STRAFE] then
+  begin
+    // new strafe mechanics
+    if (strafeDir = 0) then
+      strafeDir := MoveButton; // start strafing
+    // now set direction according to strafe (reversed)
+    if (strafeDir = 2) then
+      plr.SetDirection(TDirection.D_LEFT)
+    else if (strafeDir = 1) then
+      plr.SetDirection(TDirection.D_RIGHT)
+  end
+  else
+  begin
+    strafeDir := 0; // not strafing anymore
+    // Раньше была нажата "Вправо", а сейчас "Влево" => бежим вправо, смотрим влево:
+    if (MoveButton = 2) and gPlayerAction[p, ACTION_MOVELEFT] then
+      plr.SetDirection(TDirection.D_LEFT)
+    // Раньше была нажата "Влево", а сейчас "Вправо" => бежим влево, смотрим вправо:
+    else if (MoveButton = 1) and gPlayerAction[p, ACTION_MOVERIGHT] then
+      plr.SetDirection(TDirection.D_RIGHT)
+    // Что-то было нажато и не изменилось => куда бежим, туда и смотрим:
+    else if MoveButton <> 0 then
+      plr.SetDirection(TDirection(MoveButton-1))
+  end;

 
 

-    // if we have "strafe" key, turn off old strafe mechanics
-    if isKeyPressed(KeyStrafe, KeyStrafe2) then
-    begin
-      // new strafe mechanics
-      if (strafeDir = 0) then strafeDir := MoveButton; // start strafing
-      // now set direction according to strafe (reversed)
-           if (strafeDir = 2) then plr.SetDirection(D_LEFT)
-      else if (strafeDir = 1) then plr.SetDirection(D_RIGHT);
-    end
-    else
-    begin
-      strafeDir := 0; // not strafing anymore
-      // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî:
-           if (MoveButton = 2) and isKeyPressed(KeyLeft, KeyLeft2) then plr.SetDirection(D_LEFT)
-      // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî:
-      else if (MoveButton = 1) and isKeyPressed(KeyRight, KeyRight2) then plr.SetDirection(D_RIGHT)
-      // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì:
-      else if MoveButton <> 0 then plr.SetDirection(TDirection(MoveButton-1));
-    end;
+  // fix movebutton state
+  MoveButton := MoveButton or (strafeDir shl 4);

 
 

-    // fix movebutton state
-    MoveButton := MoveButton or (strafeDir shl 4);
+  // Остальные клавиши:
+  if gPlayerAction[p, ACTION_JUMP] then plr.PressKey(KEY_JUMP, time);
+  if gPlayerAction[p, ACTION_LOOKUP] then plr.PressKey(KEY_UP, time);
+  if gPlayerAction[p, ACTION_LOOKDOWN] then plr.PressKey(KEY_DOWN, time);
+  if gPlayerAction[p, ACTION_ATTACK] then plr.PressKey(KEY_FIRE);
+  if gPlayerAction[p, ACTION_WEAPNEXT] then plr.PressKey(KEY_NEXTWEAPON);
+  if gPlayerAction[p, ACTION_WEAPPREV] then plr.PressKey(KEY_PREVWEAPON);
+  if gPlayerAction[p, ACTION_ACTIVATE] then plr.PressKey(KEY_OPEN);

 
 

-    // Îñòàëüíûå êëàâèøè:
-    if isKeyPressed(KeyJump, KeyJump2) then plr.PressKey(KEY_JUMP, time);
-    if isKeyPressed(KeyUp, KeyUp2) then plr.PressKey(KEY_UP, time);
-    if isKeyPressed(KeyDown, KeyDown2) then plr.PressKey(KEY_DOWN, time);
-    if isKeyPressed(KeyFire, KeyFire2) then plr.PressKey(KEY_FIRE);
-    if isKeyPressed(KeyNextWeapon, KeyNextWeapon2) then plr.PressKey(KEY_NEXTWEAPON);
-    if isKeyPressed(KeyPrevWeapon, KeyPrevWeapon2) then plr.PressKey(KEY_PREVWEAPON);
-    if isKeyPressed(KeyOpen, KeyOpen2) then plr.PressKey(KEY_OPEN);
+  gPlayerAction[p, ACTION_WEAPNEXT] := False; // HACK, remove after readyweaon&pendinweapon implementation
+  gPlayerAction[p, ACTION_WEAPPREV] := False; // HACK, remove after readyweaon&pendinweapon implementation

 
 

-    for i := 0 to High(KeyWeapon) do
-      if isKeyPressed(KeyWeapon[i], KeyWeapon2[i]) then
-        plr.QueueWeaponSwitch(i); // all choices are passed there, and god will take the best
+  for i := WP_FIRST to WP_LAST do
+  begin
+    if gSelectWeapon[p, i] then
+    begin
+      plr.QueueWeaponSwitch(i); // all choices are passed there, and god will take the best
+      gSelectWeapon[p, i] := False
+    end

   end;
 
   // HACK: add dynlight here
   end;
 
   // HACK: add dynlight here


@@ -1474,6 +1649,25 @@ begin
   if gwin_has_stencil and g_playerLight then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6);
 end;
 
   if gwin_has_stencil and g_playerLight then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6);
 end;
 

+// HACK: don't have a "key was pressed" function
+procedure InterReady();
+begin
+  if InterReadyTime > gTime then Exit;
+  InterReadyTime := gTime + 3000;
+  MC_SEND_CheatRequest(NET_CHEAT_READY);
+end;
+
+procedure g_Game_PreUpdate();
+begin
+  // these are in separate PreUpdate functions because they can interact during Update()
+  // and are synced over the net
+  // we don't care that much about corpses and gibs
+  g_Player_PreUpdate();
+  g_Monsters_PreUpdate();
+  g_Items_PreUpdate();
+  g_Weapon_PreUpdate();
+end;
+

 procedure g_Game_Update();
 var
   Msg: g_gui.TMessage;
 procedure g_Game_Update();
 var
   Msg: g_gui.TMessage;


@@ -1485,26 +1679,38 @@ var
   function sendMonsPos (mon: TMonster): Boolean;
   begin
     result := false; // don't stop
   function sendMonsPos (mon: TMonster): Boolean;
   begin
     result := false; // don't stop

-    if (mon.MonsterType = MONSTER_BARREL) then
+    // this will also reset "need-send" flag
+    if mon.gncNeedSend then
+    begin
+      MH_SEND_MonsterPos(mon.UID);
+    end
+    else if (mon.MonsterType = MONSTER_BARREL) then

     begin
       if (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then MH_SEND_MonsterPos(mon.UID);
     end
     begin
       if (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then MH_SEND_MonsterPos(mon.UID);
     end

-    else
-      if (mon.MonsterState <> MONSTATE_SLEEP) then
-      begin
-        if (mon.MonsterState <> MONSTATE_DEAD) or (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then
-        begin
-          MH_SEND_MonsterPos(mon.UID);
-        end;
-      end;
+    else if (mon.MonsterState <> MONSTATE_SLEEP) then
+    begin
+      if (mon.MonsterState <> MONSTATE_DEAD) or (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then MH_SEND_MonsterPos(mon.UID);
+    end;

   end;
 
   end;
 

+  function sendMonsPosUnexpected (mon: TMonster): Boolean;
+  begin
+    result := false; // don't stop
+    // this will also reset "need-send" flag
+    if mon.gncNeedSend then MH_SEND_MonsterPos(mon.UID);
+  end;
+
+var
+  reliableUpdate: Boolean;

 begin
   g_ResetDynlights();
 begin
   g_ResetDynlights();

-// Ïîðà âûêëþ÷àòü èãðó:
+  framePool.reset();
+
+// Пора выключать игру:

   if gExit = EXIT_QUIT then
     Exit;
   if gExit = EXIT_QUIT then
     Exit;

-// Èãðà çàêîí÷èëàñü - îáðàáàòûâàåì:
+// Игра закончилась - обрабатываем:

   if gExit <> 0 then
   begin
     EndGame();
   if gExit <> 0 then
   begin
     EndGame();


@@ -1512,10 +1718,11 @@ begin
       Exit;
   end;
 
       Exit;
   end;
 

-// ×èòàåì êëàâèàòóðó è äæîéñòèê, åñëè îêíî àêòèâíî:
-  e_PollInput();
+  // Читаем клавиатуру и джойстик, если окно активно
+  // no need to, as we'll do it in event handler

 
 

-// Îáíîâëÿåì êîíñîëü (äâèæåíèå è ñîîáùåíèÿ):
+// Обновляем консоль (движение и сообщения):
+  r_Console_Update;

   g_Console_Update();
 
   if (NetMode = NET_NONE) and (g_Game_IsNet) and (gGameOn or (gState in [STATE_FOLD, STATE_INTERCUSTOM])) then
   g_Console_Update();
 
   if (NetMode = NET_NONE) and (g_Game_IsNet) and (gGameOn or (gState in [STATE_FOLD, STATE_INTERCUSTOM])) then


@@ -1525,11 +1732,14 @@ begin
     Exit;
   end;
 
     Exit;
   end;
 

+  // process master server communications
+  g_Net_Slist_Pulse();
+

   case gState of
   case gState of

-    STATE_INTERSINGLE, // Ñòàòèñòêà ïîñëå ïðîõîæäåíèÿ óðîâíÿ â Îäèíî÷íîé èãðå
-    STATE_INTERCUSTOM, // Ñòàòèñòêà ïîñëå ïðîõîæäåíèÿ óðîâíÿ â Ñâîåé èãðå
-    STATE_INTERTEXT, // Òåêñò ìåæäó óðîâíÿìè
-    STATE_INTERPIC: // Êàðòèíêà ìåæäó óðîâíÿìè
+    STATE_INTERSINGLE, // Статистка после прохождения уровня в Одиночной игре
+    STATE_INTERCUSTOM, // Статистка после прохождения уровня в Своей игре
+    STATE_INTERTEXT, // Текст между уровнями
+    STATE_INTERPIC: // Картинка между уровнями

       begin
         if g_Game_IsNet and g_Game_IsServer then
         begin
       begin
         if g_Game_IsNet and g_Game_IsServer then
         begin


@@ -1545,26 +1755,31 @@ begin
         if (not g_Game_IsClient) and
         (
           (
         if (not g_Game_IsClient) and
         (
           (

-            (e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE))
+            (
+              e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE) or
+              e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+              e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or
+              e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK)
+            )

             and (not gJustChatted) and (not gConsoleShow) and (not gChatShow)
             and (g_ActiveWindow = nil)
           )
             and (not gJustChatted) and (not gConsoleShow) and (not gChatShow)
             and (g_ActiveWindow = nil)
           )

-          or (g_Game_IsNet and (gInterTime > gInterEndTime))
+          or (g_Game_IsNet and ((gInterTime > gInterEndTime) or ((gInterReadyCount >= NetClientCount) and (NetClientCount > 0))))

         )
         then
         )
         then

-        begin // Íàæàëè <Enter>/<Ïðîáåë> èëè ïðîøëî äîñòàòî÷íî âðåìåíè:
+        begin // Нажали <Enter>/<Пробел> или прошло достаточно времени:

           g_Game_StopAllSounds(True);
 
           g_Game_StopAllSounds(True);
 

-          if gMapOnce then // Ýòî áûë òåñò
+          if gMapOnce then // Это был тест

             gExit := EXIT_SIMPLE
           else
             gExit := EXIT_SIMPLE
           else

-            if gNextMap <> '' then // Ïåðåõîäèì íà ñëåäóþùóþ êàðòó
+            if gNextMap <> '' then // Переходим на следующую карту

               g_Game_ChangeMap(gNextMap)
               g_Game_ChangeMap(gNextMap)

-            else // Ñëåäóþùåé êàðòû íåò
+            else // Следующей карты нет

             begin
               if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER] then
               begin
             begin
               if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER] then
               begin

-              // Âûõîä â ãëàâíîå ìåíþ:
+              // Выход в главное меню:

                 g_Game_Free;
                 g_GUI_ShowWindow('MainMenu');
                 gMusic.SetByName('MUSIC_MENU');
                 g_Game_Free;
                 g_GUI_ShowWindow('MainMenu');
                 gMusic.SetByName('MUSIC_MENU');


@@ -1572,7 +1787,7 @@ begin
                 gState := STATE_MENU;
               end else
               begin
                 gState := STATE_MENU;
               end else
               begin

-              // Ôèíàëüíàÿ êàðòèíêà:
+              // Финальная картинка:

                 g_Game_ExecuteEvent('onwadend');
                 g_Game_Free();
                 if not gMusic.SetByName('MUSIC_endmus') then
                 g_Game_ExecuteEvent('onwadend');
                 g_Game_Free();
                 if not gMusic.SetByName('MUSIC_endmus') then


@@ -1584,6 +1799,22 @@ begin
             end;
 
           Exit;
             end;
 
           Exit;

+        end
+        else if g_Game_IsClient and
+        (
+          (
+            e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE) or
+            e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+            e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or
+            e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK)
+          )
+          and (not gJustChatted) and (not gConsoleShow) and (not gChatShow)
+          and (g_ActiveWindow = nil)
+        )
+        then
+        begin
+          // ready / unready
+          InterReady();

         end;
 
         if gState = STATE_INTERTEXT then
         end;
 
         if gState = STATE_INTERTEXT then


@@ -1591,13 +1822,14 @@ begin
             InterText.counter := InterText.counter - 1;
       end;
 
             InterText.counter := InterText.counter - 1;
       end;
 

-    STATE_FOLD: // Çàòóõàíèå ýêðàíà
+    STATE_FOLD: // Затухание экрана

       begin
         if EndingGameCounter = 0 then
           begin
       begin
         if EndingGameCounter = 0 then
           begin

-          // Çàêîí÷èëñÿ óðîâåíü â Ñâîåé èãðå:
+          // Закончился уровень в Своей игре:

             if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
               begin
             if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
               begin

+                InterReadyTime := -1;

                 if gLastMap and (gGameSettings.GameMode = GM_COOP) then
                 begin
                   g_Game_ExecuteEvent('onwadend');
                 if gLastMap and (gGameSettings.GameMode = GM_COOP) then
                 begin
                   g_Game_ExecuteEvent('onwadend');


@@ -1609,12 +1841,14 @@ begin
 
                 gMusic.Play();
                 gState := STATE_INTERCUSTOM;
 
                 gMusic.Play();
                 gState := STATE_INTERCUSTOM;

+                e_UnpressAllKeys();

               end
               end

-            else // Çàêîí÷èëàñü ïîñëåäíÿÿ êàðòà â Îäèíî÷íîé èãðå
+            else // Закончилась последняя карта в Одиночной игре

               begin
                 gMusic.SetByName('MUSIC_INTERMUS');
                 gMusic.Play();
                 gState := STATE_INTERSINGLE;
               begin
                 gMusic.SetByName('MUSIC_INTERMUS');
                 gMusic.Play();
                 gState := STATE_INTERSINGLE;

+                e_UnpressAllKeys();

               end;
             g_Game_ExecuteEvent('oninter');
           end
               end;
             g_Game_ExecuteEvent('oninter');
           end


@@ -1622,9 +1856,9 @@ begin
           DecMin(EndingGameCounter, 6, 0);
       end;
 
           DecMin(EndingGameCounter, 6, 0);
       end;
 

-    STATE_ENDPIC: // Êàðòèíêà îêîí÷àíèÿ ìåãàÂàäà
+    STATE_ENDPIC: // Картинка окончания мегаВада

       begin
       begin

-        if gMapOnce then // Ýòî áûë òåñò
+        if gMapOnce then // Это был тест

         begin
           gExit := EXIT_SIMPLE;
           Exit;
         begin
           gExit := EXIT_SIMPLE;
           Exit;


@@ -1632,40 +1866,20 @@ begin
       end;
 
     STATE_SLIST:
       end;
 
     STATE_SLIST:

-        g_Serverlist_Control(slCurrent);
+        g_Serverlist_Control(slCurrent, slTable);

   end;
 
   end;
 

-  if g_Game_IsNet then
-    if not gConsoleShow then
-      if not gChatShow then
-      begin
-        if g_ActiveWindow = nil then
-        begin
-          if e_KeyPressed(gGameControls.GameControls.Chat) then
-            g_Console_Chat_Switch(False)
-          else if (e_KeyPressed(gGameControls.GameControls.TeamChat)) and
-                  (gGameSettings.GameMode in [GM_TDM, GM_CTF]) then
-            g_Console_Chat_Switch(True);
-        end;
-      end else
-        if not gChatEnter then
-          if (not e_KeyPressed(gGameControls.GameControls.Chat))
-             and (not e_KeyPressed(gGameControls.GameControls.TeamChat)) then
-            gChatEnter := True;
-
-// Ñòàòèñòèêà ïî Tab:
+// Статистика по Tab:

   if gGameOn then
   if gGameOn then

-    IsDrawStat := (not gConsoleShow) and (not gChatShow) and
-                  (gGameSettings.GameType <> GT_SINGLE) and
-                  e_KeyPressed(gGameControls.GameControls.Stat);
+    IsDrawStat := (not gConsoleShow) and (not gChatShow) and (gGameSettings.GameType <> GT_SINGLE) and g_Console_Action(ACTION_SCORES);

 
 

-// Èãðà èäåò:
+// Игра идет:

   if gGameOn and not gPause and (gState <> STATE_FOLD) then
   begin
   if gGameOn and not gPause and (gState <> STATE_FOLD) then
   begin

-  // Âðåìÿ += 28 ìèëëèñåêóíä:
+  // Время += 28 миллисекунд:

     gTime := gTime + GAME_TICK;
 
     gTime := gTime + GAME_TICK;
 

-  // Ñîîáùåíèå ïîñåðåäèíå ýêðàíà:
+  // Сообщение посередине экрана:

     if MessageTime = 0 then
       MessageText := '';
     if MessageTime > 0 then
     if MessageTime = 0 then
       MessageText := '';
     if MessageTime > 0 then


@@ -1673,19 +1887,19 @@ begin
 
     if (g_Game_IsServer) then
     begin
 
     if (g_Game_IsServer) then
     begin

-    // Áûë çàäàí ëèìèò âðåìåíè:
+    // Был задан лимит времени:

       if (gGameSettings.TimeLimit > 0) then
         if (gTime - gGameStartTime) div 1000 >= gGameSettings.TimeLimit then
       if (gGameSettings.TimeLimit > 0) then
         if (gTime - gGameStartTime) div 1000 >= gGameSettings.TimeLimit then

-        begin // Îí ïðîøåë => êîíåö óðîâíÿ
+        begin // Он прошел => конец уровня

           g_Game_NextLevel();
           Exit;
         end;
 
           g_Game_NextLevel();
           Exit;
         end;
 

-    // Íàäî ðåñïàâíèòü èãðîêîâ â LMS:
+    // Надо респавнить игроков в LMS:

       if (gLMSRespawn > LMS_RESPAWN_NONE) and (gLMSRespawnTime < gTime) then
         g_Game_RestartRound(gLMSSoftSpawn);
 
       if (gLMSRespawn > LMS_RESPAWN_NONE) and (gLMSRespawnTime < gTime) then
         g_Game_RestartRound(gLMSSoftSpawn);
 

-    // Ïðîâåðèì ðåçóëüòàò ãîëîñîâàíèÿ, åñëè âðåìÿ ïðîøëî
+    // Проверим результат голосования, если время прошло

       if gVoteInProgress and (gVoteTimer < gTime) then
         g_Game_CheckVote
       else if gVotePassed and (gVoteCmdTimer < gTime) then
       if gVoteInProgress and (gVoteTimer < gTime) then
         g_Game_CheckVote
       else if gVotePassed and (gVoteCmdTimer < gTime) then


@@ -1695,19 +1909,19 @@ begin
         gVotePassed := False;
       end;
 
         gVotePassed := False;
       end;
 

-    // Çàìåðÿåì âðåìÿ çàõâàòà ôëàãîâ
+    // Замеряем время захвата флагов

       if gFlags[FLAG_RED].State = FLAG_STATE_CAPTURED then
         gFlags[FLAG_RED].CaptureTime := gFlags[FLAG_RED].CaptureTime + GAME_TICK;
       if gFlags[FLAG_BLUE].State = FLAG_STATE_CAPTURED then
         gFlags[FLAG_BLUE].CaptureTime := gFlags[FLAG_BLUE].CaptureTime + GAME_TICK;
 
       if gFlags[FLAG_RED].State = FLAG_STATE_CAPTURED then
         gFlags[FLAG_RED].CaptureTime := gFlags[FLAG_RED].CaptureTime + GAME_TICK;
       if gFlags[FLAG_BLUE].State = FLAG_STATE_CAPTURED then
         gFlags[FLAG_BLUE].CaptureTime := gFlags[FLAG_BLUE].CaptureTime + GAME_TICK;
 

-    // Áûë çàäàí ëèìèò ïîáåä:
+    // Был задан лимит побед:

       if (gGameSettings.GoalLimit > 0) then
       begin
         b := 0;
 
         if gGameSettings.GameMode = GM_DM then
       if (gGameSettings.GoalLimit > 0) then
       begin
         b := 0;
 
         if gGameSettings.GameMode = GM_DM then

-          begin // Â DM èùåì èãðîêà ñ max ôðàãàìè
+          begin // В DM ищем игрока с max фрагами

             for i := 0 to High(gPlayers) do
               if gPlayers[i] <> nil then
                 if gPlayers[i].Frags > b then
             for i := 0 to High(gPlayers) do
               if gPlayers[i] <> nil then
                 if gPlayers[i].Frags > b then


@@ -1715,11 +1929,11 @@ begin
           end
         else
           if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
           end
         else
           if gGameSettings.GameMode in [GM_TDM, GM_CTF] then

-          begin //  CTF/TDM âûáèðàåì êîìàíäó ñ íàèáîëüøèì ñ÷åòîì
+          begin // В CTF/TDM выбираем команду с наибольшим счетом

             b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
           end;
 
             b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
           end;
 

-      // Ëèìèò ïîáåä íàáðàí => êîíåö óðîâíÿ:
+      // Лимит побед набран => конец уровня:

         if b >= gGameSettings.GoalLimit then
         begin
           g_Game_NextLevel();
         if b >= gGameSettings.GoalLimit then
         begin
           g_Game_NextLevel();


@@ -1727,13 +1941,13 @@ begin
         end;
       end;
 
         end;
       end;
 

-    // Îáðàáàòûâàåì êëàâèøè èãðîêîâ:
+    // Обрабатываем клавиши игроков:

       if gPlayer1 <> nil then gPlayer1.ReleaseKeys();
       if gPlayer2 <> nil then gPlayer2.ReleaseKeys();
       if (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
       begin
       if gPlayer1 <> nil then gPlayer1.ReleaseKeys();
       if gPlayer2 <> nil then gPlayer2.ReleaseKeys();
       if (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
       begin

-        processPlayerControls(gPlayer1, gGameControls.P1Control, P1MoveButton);
-        processPlayerControls(gPlayer2, gGameControls.P2Control, P2MoveButton, true);
+        ProcessPlayerControls(gPlayer1, 0, P1MoveButton);
+        ProcessPlayerControls(gPlayer2, 1, P2MoveButton);

       end  // if not console
       else
       begin
       end  // if not console
       else
       begin


@@ -1742,13 +1956,13 @@ begin
       // process weapon switch queue
     end; // if server
 
       // process weapon switch queue
     end; // if server
 

-  // Íàáëþäàòåëü
+  // Наблюдатель

     if (gPlayer1 = nil) and (gPlayer2 = nil) and
        (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
     begin
       if not gSpectKeyPress then
       begin
     if (gPlayer1 = nil) and (gPlayer2 = nil) and
        (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
     begin
       if not gSpectKeyPress then
       begin

-        if isKeyPressed(gGameControls.P1Control.KeyJump, gGameControls.P1Control.KeyJump2) then
+        if gPlayerAction[0, ACTION_JUMP] and (not gSpectAuto) then

         begin
           // switch spect mode
           case gSpectMode of
         begin
           // switch spect mode
           case gSpectMode of


@@ -1759,96 +1973,168 @@ begin
           end;
           gSpectKeyPress := True;
         end;
           end;
           gSpectKeyPress := True;
         end;

-        if gSpectMode = SPECT_MAPVIEW then
+        if (gSpectMode = SPECT_MAPVIEW)
+           and (not gSpectAuto) then

         begin
         begin

-          if isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2) then
+          if gPlayerAction[0, ACTION_MOVELEFT] then

             gSpectX := Max(gSpectX - gSpectStep, 0);
             gSpectX := Max(gSpectX - gSpectStep, 0);

-          if isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2) then
+          if gPlayerAction[0, ACTION_MOVERIGHT] then

             gSpectX := Min(gSpectX + gSpectStep, gMapInfo.Width - gScreenWidth);
             gSpectX := Min(gSpectX + gSpectStep, gMapInfo.Width - gScreenWidth);

-          if isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2) then
+          if gPlayerAction[0, ACTION_LOOKUP] then

             gSpectY := Max(gSpectY - gSpectStep, 0);
             gSpectY := Max(gSpectY - gSpectStep, 0);

-          if isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2) then
+          if gPlayerAction[0, ACTION_LOOKDOWN] then

             gSpectY := Min(gSpectY + gSpectStep, gMapInfo.Height - gScreenHeight);
             gSpectY := Min(gSpectY + gSpectStep, gMapInfo.Height - gScreenHeight);

-          if isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2) then
+          if gPlayerAction[0, ACTION_WEAPPREV] then

           begin
             // decrease step
             if gSpectStep > 4 then gSpectStep := gSpectStep shr 1;
             gSpectKeyPress := True;
           end;
           begin
             // decrease step
             if gSpectStep > 4 then gSpectStep := gSpectStep shr 1;
             gSpectKeyPress := True;
           end;

-          if isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2) then
+          if gPlayerAction[0, ACTION_WEAPNEXT] then

           begin
             // increase step
             if gSpectStep < 64 then gSpectStep := gSpectStep shl 1;
             gSpectKeyPress := True;
           end;
         end;
           begin
             // increase step
             if gSpectStep < 64 then gSpectStep := gSpectStep shl 1;
             gSpectKeyPress := True;
           end;
         end;

-        if gSpectMode = SPECT_PLAYERS then
+        if (gSpectMode = SPECT_PLAYERS)
+           and (not gSpectAuto) then

         begin
         begin

-          if isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2) then
+          if gPlayerAction[0, ACTION_LOOKUP] then

           begin
             // add second view
             gSpectViewTwo := True;
             gSpectKeyPress := True;
           end;
           begin
             // add second view
             gSpectViewTwo := True;
             gSpectKeyPress := True;
           end;

-          if isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2) then
+          if gPlayerAction[0, ACTION_LOOKDOWN] then

           begin
             // remove second view
             gSpectViewTwo := False;
             gSpectKeyPress := True;
           end;
           begin
             // remove second view
             gSpectViewTwo := False;
             gSpectKeyPress := True;
           end;

-          if isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2) then
+          if gPlayerAction[0, ACTION_MOVELEFT] then

           begin
             // prev player (view 1)
             gSpectPID1 := GetActivePlayerID_Prev(gSpectPID1);
             gSpectKeyPress := True;
           end;
           begin
             // prev player (view 1)
             gSpectPID1 := GetActivePlayerID_Prev(gSpectPID1);
             gSpectKeyPress := True;
           end;

-          if isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2) then
+          if gPlayerAction[0, ACTION_MOVERIGHT] then

           begin
             // next player (view 1)
             gSpectPID1 := GetActivePlayerID_Next(gSpectPID1);
             gSpectKeyPress := True;
           end;
           begin
             // next player (view 1)
             gSpectPID1 := GetActivePlayerID_Next(gSpectPID1);
             gSpectKeyPress := True;
           end;

-          if isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2) then
+          if gPlayerAction[0, ACTION_WEAPPREV] then

           begin
             // prev player (view 2)
             gSpectPID2 := GetActivePlayerID_Prev(gSpectPID2);
             gSpectKeyPress := True;
           end;
           begin
             // prev player (view 2)
             gSpectPID2 := GetActivePlayerID_Prev(gSpectPID2);
             gSpectKeyPress := True;
           end;

-          if isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2) then
+          if gPlayerAction[0, ACTION_WEAPNEXT] then

           begin
             // next player (view 2)
             gSpectPID2 := GetActivePlayerID_Next(gSpectPID2);
             gSpectKeyPress := True;
           end;
         end;
           begin
             // next player (view 2)
             gSpectPID2 := GetActivePlayerID_Next(gSpectPID2);
             gSpectKeyPress := True;
           end;
         end;

+        if gPlayerAction[0, ACTION_ATTACK] then
+        begin
+          if (gSpectMode = SPECT_STATS) and (not gSpectAuto) then
+          begin
+            gSpectAuto := True;
+            gSpectAutoNext := 0;
+            gSpectViewTwo := False;
+            gSpectKeyPress := True;
+          end
+          else
+            if gSpectAuto then
+            begin
+              gSpectMode := SPECT_STATS;
+              gSpectAuto := False;
+              gSpectKeyPress := True;
+            end;
+        end;

       end
       else
       end
       else

-        if (not isKeyPressed(gGameControls.P1Control.KeyJump, gGameControls.P1Control.KeyJump2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2)) then
+        if (not gPlayerAction[0, ACTION_JUMP]) and
+           (not gPlayerAction[0, ACTION_ATTACK]) and
+           (not gPlayerAction[0, ACTION_MOVELEFT]) and
+           (not gPlayerAction[0, ACTION_MOVERIGHT]) and
+           (not gPlayerAction[0, ACTION_LOOKUP]) and
+           (not gPlayerAction[0, ACTION_LOOKDOWN]) and
+           (not gPlayerAction[0, ACTION_WEAPPREV]) and
+           (not gPlayerAction[0, ACTION_WEAPNEXT]) then

           gSpectKeyPress := False;
           gSpectKeyPress := False;

+
+      if gSpectAuto then
+      begin
+        if gSpectMode = SPECT_MAPVIEW then
+        begin
+          i := Min(Max(gSpectX + gSpectAutoStepX, 0), gMapInfo.Width - gScreenWidth);
+          if i = gSpectX then
+            gSpectAutoNext := gTime
+          else
+            gSpectX := i;
+          i := Min(Max(gSpectY + gSpectAutoStepY, 0), gMapInfo.Height - gScreenHeight);
+          if i = gSpectY then
+            gSpectAutoNext := gTime
+          else
+            gSpectY := i;
+        end;
+        if gSpectAutoNext <= gTime then
+        begin
+          if gSpectAutoNext > 0 then
+          begin
+            gSpectMode := GetRandomSpectMode(gSpectMode);
+            case gSpectMode of
+              SPECT_MAPVIEW:
+              begin
+                gSpectX := Random(gMapInfo.Width - gScreenWidth);
+                gSpectY := Random(gMapInfo.Height - gScreenHeight);
+                gSpectAutoStepX := Random(9) - 4;
+                gSpectAutoStepY := Random(9) - 4;
+                if ((gSpectX < 800) and (gSpectAutoStepX < 0)) or
+                   ((gSpectX > gMapInfo.Width - gScreenWidth - 800) and (gSpectAutoStepX > 0)) then
+                  gSpectAutoStepX := gSpectAutoStepX * -1;
+                if ((gSpectY < 800) and (gSpectAutoStepY < 0)) or
+                   ((gSpectY > gMapInfo.Height - gScreenHeight - 800) and (gSpectAutoStepY > 0)) then
+                  gSpectAutoStepY := gSpectAutoStepY * -1;
+              end;
+              SPECT_PLAYERS:
+              begin
+                gSpectPID1 := GetActivePlayerID_Random(gSpectPID1);
+              end;
+            end;
+          end;
+          case gSpectMode of
+            SPECT_STATS:   gSpectAutoNext := gTime + (Random(3) + 5) * 1000;
+            SPECT_MAPVIEW: gSpectAutoNext := gTime + (Random(4) + 7) * 1000;
+            SPECT_PLAYERS: gSpectAutoNext := gTime + (Random(7) + 8) * 1000;
+          end;
+        end;
+      end;

     end;
 
     end;
 

-  // Îáíîâëÿåì âñå îñòàëüíîå:
+  // Обновляем все остальное:

     g_Map_Update();
     g_Items_Update();
     g_Triggers_Update();
     g_Weapon_Update();
     g_Monsters_Update();
     g_GFX_Update();
     g_Map_Update();
     g_Items_Update();
     g_Triggers_Update();
     g_Weapon_Update();
     g_Monsters_Update();
     g_GFX_Update();

+    r_GFX_Update;

     g_Player_UpdateAll();
     g_Player_UpdatePhysicalObjects();
     g_Player_UpdateAll();
     g_Player_UpdatePhysicalObjects();

-    if gGameSettings.GameType = GT_SERVER then
-      if Length(gMonstersSpawned) > 0 then
+
+    // server: send newly spawned monsters unconditionally
+    if (gGameSettings.GameType = GT_SERVER) then
+    begin
+      if (Length(gMonstersSpawned) > 0) then

       begin
       begin

-        for I := 0 to High(gMonstersSpawned) do
-          MH_SEND_MonsterSpawn(gMonstersSpawned[I]);
+        for I := 0 to High(gMonstersSpawned) do MH_SEND_MonsterSpawn(gMonstersSpawned[I]);

         SetLength(gMonstersSpawned, 0);
       end;
         SetLength(gMonstersSpawned, 0);
       end;

+    end;

 
     if (gSoundTriggerTime > 8) then
     begin
 
     if (gSoundTriggerTime > 8) then
     begin


@@ -1856,52 +2142,67 @@ begin
       gSoundTriggerTime := 0;
     end
     else
       gSoundTriggerTime := 0;
     end
     else

+    begin

       Inc(gSoundTriggerTime);
       Inc(gSoundTriggerTime);

+    end;

 
     if (NetMode = NET_SERVER) then
     begin
       Inc(NetTimeToUpdate);
       Inc(NetTimeToReliable);
 
     if (NetMode = NET_SERVER) then
     begin
       Inc(NetTimeToUpdate);
       Inc(NetTimeToReliable);

-      if NetTimeToReliable >= NetRelupdRate then
+
+      // send monster updates
+      if (NetTimeToReliable >= NetRelupdRate) or (NetTimeToUpdate >= NetUpdateRate) then

       begin
       begin

+        // send all monsters (periodic sync)
+        reliableUpdate := (NetTimeToReliable >= NetRelupdRate);
+

         for I := 0 to High(gPlayers) do
         for I := 0 to High(gPlayers) do

-          if gPlayers[I] <> nil then
-            MH_SEND_PlayerPos(True, gPlayers[I].UID);
+        begin
+          if (gPlayers[I] <> nil) then MH_SEND_PlayerPos(reliableUpdate, gPlayers[I].UID);
+        end;

 
         g_Mons_ForEach(sendMonsPos);
 
 
         g_Mons_ForEach(sendMonsPos);
 

-        NetTimeToReliable := 0;
-        NetTimeToUpdate := NetUpdateRate;
+        if reliableUpdate then
+        begin
+          NetTimeToReliable := 0;
+          NetTimeToUpdate := NetUpdateRate;
+        end
+        else
+        begin
+          NetTimeToUpdate := 0;
+        end;

       end
       end

-      else if NetTimeToUpdate >= NetUpdateRate then
+      else

       begin
       begin

-        if gPlayers <> nil then
-          for I := 0 to High(gPlayers) do
-            if gPlayers[I] <> nil then
-              MH_SEND_PlayerPos(False, gPlayers[I].UID);
-
-        g_Mons_ForEach(sendMonsPos);
-
-        NetTimeToUpdate := 0;
+        // send only mosters with some unexpected changes
+        g_Mons_ForEach(sendMonsPosUnexpected);

       end;
 
       end;
 

+      // send unexpected platform changes
+      g_Map_NetSendInterestingPanels();
+
+      g_Net_Slist_ServerUpdate();
+      {

       if NetUseMaster then
       if NetUseMaster then

-        if gTime >= NetTimeToMaster then
+      begin
+        if (gTime >= NetTimeToMaster) or g_Net_Slist_IsConnectionInProgress then

         begin
         begin

-          if (NetMHost = nil) or (NetMPeer = nil) then
-            if not g_Net_Slist_Connect then
-              g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR]);
-
+          if (not g_Net_Slist_IsConnectionActive) then g_Net_Slist_Connect(false); // non-blocking connection to the master

           g_Net_Slist_Update;
           NetTimeToMaster := gTime + NetMasterRate;
         end;
           g_Net_Slist_Update;
           NetTimeToMaster := gTime + NetMasterRate;
         end;

+      end;
+      }

     end
     end

-    else
-      if NetMode = NET_CLIENT then
-        MC_SEND_PlayerPos();
+    else if (NetMode = NET_CLIENT) then
+    begin
+      MC_SEND_PlayerPos();
+    end;

   end; // if gameOn ...
 
   end; // if gameOn ...
 

-// Àêòèâíî îêíî èíòåðôåéñà - ïåðåäàåì êëàâèøè åìó:
+// Активно окно интерфейса - передаем клавиши ему:

   if g_ActiveWindow <> nil then
   begin
     w := e_GetFirstKeyPressed();
   if g_ActiveWindow <> nil then
   begin
     w := e_GetFirstKeyPressed();


@@ -1913,38 +2214,33 @@ begin
         g_ActiveWindow.OnMessage(Msg);
       end;
 
         g_ActiveWindow.OnMessage(Msg);
       end;
 

-  // Åñëè îíî îò ýòîãî íå çàêðûëîñü, òî îáíîâëÿåì:
+  // Если оно от этого не закрылось, то обновляем:

     if g_ActiveWindow <> nil then
       g_ActiveWindow.Update();
 
     if g_ActiveWindow <> nil then
       g_ActiveWindow.Update();
 

-  // Íóæíî ñìåíèòü ðàçðåøåíèå:
+  // Нужно сменить разрешение:

     if gResolutionChange then
     begin
     if gResolutionChange then
     begin

-      e_WriteLog('Changing resolution', MSG_NOTIFY);
-      g_Game_ChangeResolution(gRC_Width, gRC_Height, gRC_FullScreen, gRC_Maximized);
+      e_WriteLog('Changing resolution', TMsgType.Notify);
+      r_Render_Apply;

       gResolutionChange := False;
       gResolutionChange := False;

+      g_ActiveWindow := nil;

     end;
 
     end;
 

-  // Íóæíî ñìåíèòü ÿçûê:
+  // Нужно сменить язык:

     if gLanguageChange then
     begin
       //e_WriteLog('Read language file', MSG_NOTIFY);
       //g_Language_Load(DataDir + gLanguage + '.txt');
       g_Language_Set(gLanguage);
     if gLanguageChange then
     begin
       //e_WriteLog('Read language file', MSG_NOTIFY);
       //g_Language_Load(DataDir + gLanguage + '.txt');
       g_Language_Set(gLanguage);

+{$IFNDEF HEADLESS}

       g_Menu_Reset();
       g_Menu_Reset();

+{$ENDIF}

       gLanguageChange := False;
     end;
   end;
 
       gLanguageChange := False;
     end;
   end;
 

-// Äåëàåì ñêðèíøîò (íå ÷àùå 200 ìèëëèñåêóíä):
-  if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) then
-    if (GetTimer()-LastScreenShot) > 200000 div 1000 then
-    begin
-      g_TakeScreenShot();
-      LastScreenShot := GetTimer();
-    end;
-
-// Ãîðÿ÷àÿ êëàâèøà äëÿ âûçîâà ìåíþ âûõîäà èç èãðû (F10):
+// Горячая клавиша для вызова меню выхода из игры (F10):

   if e_KeyPressed(IK_F10) and
      gGameOn and
      (not gConsoleShow) and
   if e_KeyPressed(IK_F10) and
      gGameOn and
      (not gConsoleShow) and


@@ -1953,9 +2249,9 @@ begin
     KeyPress(IK_F10);
   end;
 
     KeyPress(IK_F10);
   end;
 

-  Time := GetTimer() {div 1000};
+  Time := GetTickCount64() {div 1000};

 
 

-// Îáðàáîòêà îòëîæåííûõ ñîáûòèé:
+// Обработка отложенных событий:

   if gDelayedEvents <> nil then
     for a := 0 to High(gDelayedEvents) do
       if gDelayedEvents[a].Pending and
   if gDelayedEvents <> nil then
     for a := 0 to High(gDelayedEvents) do
       if gDelayedEvents[a].Pending and


@@ -1977,11 +2273,14 @@ begin
               if g_Game_IsNet and g_Game_IsServer then
                 MH_SEND_GameEvent(NET_EV_KILLCOMBO, gDelayedEvents[a].DENum);
             end;
               if g_Game_IsNet and g_Game_IsServer then
                 MH_SEND_GameEvent(NET_EV_KILLCOMBO, gDelayedEvents[a].DENum);
             end;

+          DE_BODYKILL:
+            if gGameOn then
+              g_Game_Announce_BodyKill(gDelayedEvents[a].DENum);

         end;
         gDelayedEvents[a].Pending := False;
       end;
 
         end;
         gDelayedEvents[a].Pending := False;
       end;
 

-// Êàæäóþ ñåêóíäó îáíîâëÿåì ñ÷åò÷èê îáíîâëåíèé:
+// Каждую секунду обновляем счетчик обновлений:

   UPSCounter := UPSCounter + 1;
   if Time - UPSTime >= 1000 then
   begin
   UPSCounter := UPSCounter + 1;
   if Time - UPSTime >= 1000 then
   begin


@@ -1997,35 +2296,79 @@ begin
   end;
 end;
 
   end;
 end;
 

+procedure g_Game_LoadChatSounds(Resource: string);
+var
+  WAD: TWADFile;
+  FileName, Snd: string;
+  p: Pointer;
+  len, cnt, tags, i, j: Integer;
+  cfg: TConfig;
+begin
+  FileName := g_ExtractWadName(Resource);
+
+  WAD := TWADFile.Create();
+  WAD.ReadFile(FileName);
+
+  if not WAD.GetResource(g_ExtractFilePathName(Resource), p, len) then
+  begin
+    gChatSounds := nil;
+    WAD.Free();
+    Exit;
+  end;
+
+  cfg := TConfig.CreateMem(p, len);
+  cnt := cfg.ReadInt('ChatSounds', 'Count', 0);
+
+  SetLength(gChatSounds, cnt);
+  for i := 0 to Length(gChatSounds) - 1 do
+  begin
+    gChatSounds[i].Sound := nil;
+    Snd := Trim(cfg.ReadStr(IntToStr(i), 'Sound', ''));
+    tags := cfg.ReadInt(IntToStr(i), 'Tags', 0);
+    if (Snd = '') or (Tags <= 0) then
+      continue;
+    g_Sound_CreateWADEx('SOUND_CHAT_MACRO' + IntToStr(i), GameWAD+':'+Snd);
+    gChatSounds[i].Sound := TPlayableSound.Create();
+    gChatSounds[i].Sound.SetByName('SOUND_CHAT_MACRO' + IntToStr(i));
+    SetLength(gChatSounds[i].Tags, tags);
+    for j := 0 to tags - 1 do
+      gChatSounds[i].Tags[j] := toLowerCase1251(cfg.ReadStr(IntToStr(i), 'Tag' + IntToStr(j), ''));
+    gChatSounds[i].FullWord := cfg.ReadBool(IntToStr(i), 'FullWord', False);
+  end;
+
+  cfg.Free();
+  WAD.Free();
+end;
+
+procedure g_Game_FreeChatSounds();
+var
+  i: Integer;
+begin
+  for i := 0 to Length(gChatSounds) - 1 do
+  begin
+    gChatSounds[i].Sound.Free();
+    g_Sound_Delete('SOUND_CHAT_MACRO' + IntToStr(i));
+  end;
+  SetLength(gChatSounds, 0);
+  gChatSounds := nil;
+end;
+

 procedure g_Game_LoadData();
 begin
   if DataLoaded then Exit;
 
 procedure g_Game_LoadData();
 begin
   if DataLoaded then Exit;
 

-  e_WriteLog('Loading game data...', MSG_NOTIFY);
-
-  g_Texture_CreateWADEx('NOTEXTURE', GameWAD+':TEXTURES\NOTEXTURE');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_HUD', GameWAD+':TEXTURES\HUD');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDAIR', GameWAD+':TEXTURES\AIRBAR');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDJET', GameWAD+':TEXTURES\JETBAR');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDBG', GameWAD+':TEXTURES\HUDBG');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_ARMORHUD', GameWAD+':TEXTURES\ARMORHUD');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG', GameWAD+':TEXTURES\FLAGHUD_RB');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_S', GameWAD+':TEXTURES\FLAGHUD_RS');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_D', GameWAD+':TEXTURES\FLAGHUD_RD');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG', GameWAD+':TEXTURES\FLAGHUD_BB');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_S', GameWAD+':TEXTURES\FLAGHUD_BS');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_BD');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_TALKBUBBLE', GameWAD+':TEXTURES\TALKBUBBLE');
-  g_Texture_CreateWADEx('TEXTURE_PLAYER_INVULPENTA', GameWAD+':TEXTURES\PENTA');
-  g_Frames_CreateWAD(nil, 'FRAMES_TELEPORT', GameWAD+':TEXTURES\TELEPORT', 64, 64, 10, False);
+  e_WriteLog('Loading game data...', TMsgType.Notify);
+

   g_Sound_CreateWADEx('SOUND_GAME_TELEPORT', GameWAD+':SOUNDS\TELEPORT');
   g_Sound_CreateWADEx('SOUND_GAME_NOTELEPORT', GameWAD+':SOUNDS\NOTELEPORT');
   g_Sound_CreateWADEx('SOUND_GAME_TELEPORT', GameWAD+':SOUNDS\TELEPORT');
   g_Sound_CreateWADEx('SOUND_GAME_NOTELEPORT', GameWAD+':SOUNDS\NOTELEPORT');

+  g_Sound_CreateWADEx('SOUND_GAME_SECRET', GameWAD+':SOUNDS\SECRET');

   g_Sound_CreateWADEx('SOUND_GAME_DOOROPEN', GameWAD+':SOUNDS\DOOROPEN');
   g_Sound_CreateWADEx('SOUND_GAME_DOORCLOSE', GameWAD+':SOUNDS\DOORCLOSE');
   g_Sound_CreateWADEx('SOUND_GAME_BULK1', GameWAD+':SOUNDS\BULK1');
   g_Sound_CreateWADEx('SOUND_GAME_BULK2', GameWAD+':SOUNDS\BULK2');
   g_Sound_CreateWADEx('SOUND_GAME_BUBBLE1', GameWAD+':SOUNDS\BUBBLE1');
   g_Sound_CreateWADEx('SOUND_GAME_BUBBLE2', GameWAD+':SOUNDS\BUBBLE2');
   g_Sound_CreateWADEx('SOUND_GAME_DOOROPEN', GameWAD+':SOUNDS\DOOROPEN');
   g_Sound_CreateWADEx('SOUND_GAME_DOORCLOSE', GameWAD+':SOUNDS\DOORCLOSE');
   g_Sound_CreateWADEx('SOUND_GAME_BULK1', GameWAD+':SOUNDS\BULK1');
   g_Sound_CreateWADEx('SOUND_GAME_BULK2', GameWAD+':SOUNDS\BULK2');
   g_Sound_CreateWADEx('SOUND_GAME_BUBBLE1', GameWAD+':SOUNDS\BUBBLE1');
   g_Sound_CreateWADEx('SOUND_GAME_BUBBLE2', GameWAD+':SOUNDS\BUBBLE2');

+  g_Sound_CreateWADEx('SOUND_GAME_BURNING', GameWAD+':SOUNDS\BURNING');

   g_Sound_CreateWADEx('SOUND_GAME_SWITCH1', GameWAD+':SOUNDS\SWITCH1');
   g_Sound_CreateWADEx('SOUND_GAME_SWITCH0', GameWAD+':SOUNDS\SWITCH0');
   g_Sound_CreateWADEx('SOUND_GAME_RADIO', GameWAD+':SOUNDS\RADIO');
   g_Sound_CreateWADEx('SOUND_GAME_SWITCH1', GameWAD+':SOUNDS\SWITCH1');
   g_Sound_CreateWADEx('SOUND_GAME_SWITCH0', GameWAD+':SOUNDS\SWITCH0');
   g_Sound_CreateWADEx('SOUND_GAME_RADIO', GameWAD+':SOUNDS\RADIO');


@@ -2037,6 +2380,17 @@ begin
   g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL3X', GameWAD+':SOUNDS\KILL3X');
   g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL4X', GameWAD+':SOUNDS\KILL4X');
   g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILLMX', GameWAD+':SOUNDS\KILLMX');
   g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL3X', GameWAD+':SOUNDS\KILL3X');
   g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL4X', GameWAD+':SOUNDS\KILL4X');
   g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILLMX', GameWAD+':SOUNDS\KILLMX');

+  g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA1', GameWAD+':SOUNDS\MUHAHA1');
+  g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA2', GameWAD+':SOUNDS\MUHAHA2');
+  g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA3', GameWAD+':SOUNDS\MUHAHA3');
+  g_Sound_CreateWADEx('SOUND_CTF_GET1', GameWAD+':SOUNDS\GETFLAG1');
+  g_Sound_CreateWADEx('SOUND_CTF_GET2', GameWAD+':SOUNDS\GETFLAG2');
+  g_Sound_CreateWADEx('SOUND_CTF_LOST1', GameWAD+':SOUNDS\LOSTFLG1');
+  g_Sound_CreateWADEx('SOUND_CTF_LOST2', GameWAD+':SOUNDS\LOSTFLG2');
+  g_Sound_CreateWADEx('SOUND_CTF_RETURN1', GameWAD+':SOUNDS\RETFLAG1');
+  g_Sound_CreateWADEx('SOUND_CTF_RETURN2', GameWAD+':SOUNDS\RETFLAG2');
+  g_Sound_CreateWADEx('SOUND_CTF_CAPTURE1', GameWAD+':SOUNDS\CAPFLAG1');
+  g_Sound_CreateWADEx('SOUND_CTF_CAPTURE2', GameWAD+':SOUNDS\CAPFLAG2');

 
   goodsnd[0] := TPlayableSound.Create();
   goodsnd[1] := TPlayableSound.Create();
 
   goodsnd[0] := TPlayableSound.Create();
   goodsnd[1] := TPlayableSound.Create();


@@ -2058,6 +2412,34 @@ begin
   killsnd[2].SetByName('SOUND_ANNOUNCER_KILL4X');
   killsnd[3].SetByName('SOUND_ANNOUNCER_KILLMX');
 
   killsnd[2].SetByName('SOUND_ANNOUNCER_KILL4X');
   killsnd[3].SetByName('SOUND_ANNOUNCER_KILLMX');
 

+  hahasnd[0] := TPlayableSound.Create();
+  hahasnd[1] := TPlayableSound.Create();
+  hahasnd[2] := TPlayableSound.Create();
+
+  hahasnd[0].SetByName('SOUND_ANNOUNCER_MUHAHA1');
+  hahasnd[1].SetByName('SOUND_ANNOUNCER_MUHAHA2');
+  hahasnd[2].SetByName('SOUND_ANNOUNCER_MUHAHA3');
+
+  sound_get_flag[0] := TPlayableSound.Create();
+  sound_get_flag[1] := TPlayableSound.Create();
+  sound_lost_flag[0] := TPlayableSound.Create();
+  sound_lost_flag[1] := TPlayableSound.Create();
+  sound_ret_flag[0] := TPlayableSound.Create();
+  sound_ret_flag[1] := TPlayableSound.Create();
+  sound_cap_flag[0] := TPlayableSound.Create();
+  sound_cap_flag[1] := TPlayableSound.Create();
+
+  sound_get_flag[0].SetByName('SOUND_CTF_GET1');
+  sound_get_flag[1].SetByName('SOUND_CTF_GET2');
+  sound_lost_flag[0].SetByName('SOUND_CTF_LOST1');
+  sound_lost_flag[1].SetByName('SOUND_CTF_LOST2');
+  sound_ret_flag[0].SetByName('SOUND_CTF_RETURN1');
+  sound_ret_flag[1].SetByName('SOUND_CTF_RETURN2');
+  sound_cap_flag[0].SetByName('SOUND_CTF_CAPTURE1');
+  sound_cap_flag[1].SetByName('SOUND_CTF_CAPTURE2');
+
+  g_Game_LoadChatSounds(GameWAD+':CHATSND\SNDCFG');
+

   g_Game_SetLoadingText(_lc[I_LOAD_ITEMS_DATA], 0, False);
   g_Items_LoadData();
 
   g_Game_SetLoadingText(_lc[I_LOAD_ITEMS_DATA], 0, False);
   g_Items_LoadData();
 


@@ -2069,1359 +2451,113 @@ begin
   DataLoaded := True;
 end;
 
   DataLoaded := True;
 end;
 

-procedure g_Game_FreeData();
+procedure g_Game_Quit();

 begin
 begin

-  if not DataLoaded then Exit;
+  g_Game_StopAllSounds(True);
+  gMusic.Free();
+  g_Game_FreeData();
+  g_PlayerModel_FreeData();
+{$IFNDEF HEADLESS}
+  //g_Menu_Free(); //k8: this segfaults after resolution change; who cares?
+{$ENDIF}

 
 

-  g_Items_FreeData();
-  g_Weapon_FreeData();
-  g_Monsters_FreeData();
-
-  e_WriteLog('Releasing game data...', MSG_NOTIFY);
-
-  g_Texture_Delete('NOTEXTURE');
-  g_Texture_Delete('TEXTURE_PLAYER_HUD');
-  g_Texture_Delete('TEXTURE_PLAYER_HUDBG');
-  g_Texture_Delete('TEXTURE_PLAYER_ARMORHUD');
-  g_Texture_Delete('TEXTURE_PLAYER_REDFLAG');
-  g_Texture_Delete('TEXTURE_PLAYER_REDFLAG_S');
-  g_Texture_Delete('TEXTURE_PLAYER_REDFLAG_D');
-  g_Texture_Delete('TEXTURE_PLAYER_BLUEFLAG');
-  g_Texture_Delete('TEXTURE_PLAYER_BLUEFLAG_S');
-  g_Texture_Delete('TEXTURE_PLAYER_BLUEFLAG_D');
-  g_Texture_Delete('TEXTURE_PLAYER_TALKBUBBLE');
-  g_Texture_Delete('TEXTURE_PLAYER_INVULPENTA');
-  g_Frames_DeleteByName('FRAMES_TELEPORT');
-  g_Sound_Delete('SOUND_GAME_TELEPORT');
-  g_Sound_Delete('SOUND_GAME_NOTELEPORT');
-  g_Sound_Delete('SOUND_GAME_DOOROPEN');
-  g_Sound_Delete('SOUND_GAME_DOORCLOSE');
-  g_Sound_Delete('SOUND_GAME_BULK1');
-  g_Sound_Delete('SOUND_GAME_BULK2');
-  g_Sound_Delete('SOUND_GAME_BUBBLE1');
-  g_Sound_Delete('SOUND_GAME_BUBBLE2');
-  g_Sound_Delete('SOUND_GAME_SWITCH1');
-  g_Sound_Delete('SOUND_GAME_SWITCH0');
-
-  goodsnd[0].Free();
-  goodsnd[1].Free();
-  goodsnd[2].Free();
-  goodsnd[3].Free();
-
-  g_Sound_Delete('SOUND_ANNOUNCER_GOOD1');
-  g_Sound_Delete('SOUND_ANNOUNCER_GOOD2');
-  g_Sound_Delete('SOUND_ANNOUNCER_GOOD3');
-  g_Sound_Delete('SOUND_ANNOUNCER_GOOD4');
-
-  killsnd[0].Free();
-  killsnd[1].Free();
-  killsnd[2].Free();
-  killsnd[3].Free();
-
-  g_Sound_Delete('SOUND_ANNOUNCER_KILL2X');
-  g_Sound_Delete('SOUND_ANNOUNCER_KILL3X');
-  g_Sound_Delete('SOUND_ANNOUNCER_KILL4X');
-  g_Sound_Delete('SOUND_ANNOUNCER_KILLMX');
-
-  DataLoaded := False;
-end;
-
-procedure DrawCustomStat();
-var
-  pc, x, y, w, _y,
-  w1, w2, w3,
-  t, p, m: Integer;
-  ww1, hh1: Word;
-  ww2, hh2, r, g, b, rr, gg, bb: Byte;
-  s1, s2, topstr: String;
-begin
-  e_TextureFontGetSize(gStdFont, ww2, hh2);
-
-  e_PollInput();
-  if e_KeyPressed(IK_TAB) then
-  begin
-    if not gStatsPressed then
-    begin
-      gStatsOff := not gStatsOff;
-      gStatsPressed := True;
-    end;
-  end
-  else
-    gStatsPressed := False;
-
-  if gStatsOff then
-  begin
-    s1 := _lc[I_MENU_INTER_NOTICE_TAB];
-    w := (Length(s1) * ww2) div 2;
-    x := gScreenWidth div 2 - w;
-    y := 8;
-    e_TextureFontPrint(x, y, s1, gStdFont);
-    Exit;
-  end;
-
-  if (gGameSettings.GameMode = GM_COOP) then
-  begin
-    if gMissionFailed then
-      topstr := _lc[I_MENU_INTER_MISSION_FAIL]
-    else
-      topstr := _lc[I_MENU_INTER_LEVEL_COMPLETE];
-  end
-  else
-    topstr := _lc[I_MENU_INTER_ROUND_OVER];
-
-  e_CharFont_GetSize(gMenuFont, topstr, ww1, hh1);
-  e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(ww1 div 2), 16, topstr);
-
-  if g_Game_IsNet then
-  begin
-    topstr := Format(_lc[I_MENU_INTER_NOTICE_TIME], [gServInterTime]);
-    if not gChatShow then
-      e_TextureFontPrintEx((gScreenWidth div 2)-(Length(topstr)*ww2 div 2),
-                           gScreenHeight-(hh2+4)*2, topstr, gStdFont, 255, 255, 255, 1);
-  end;
-
-  if g_Game_IsClient then
-    topstr := _lc[I_MENU_INTER_NOTICE_MAP]
-  else
-    topstr := _lc[I_MENU_INTER_NOTICE_SPACE];
-  if not gChatShow then
-    e_TextureFontPrintEx((gScreenWidth div 2)-(Length(topstr)*ww2 div 2),
-                         gScreenHeight-(hh2+4), topstr, gStdFont, 255, 255, 255, 1);
-
-  x := 32;
-  y := 16+hh1+16;
-
-  w := gScreenWidth-x*2;
-
-  w2 := (w-16) div 6;
-  w3 := w2;
-  w1 := w-16-w2-w3;
-
-  e_DrawFillQuad(x, y, gScreenWidth-x-1, gScreenHeight-y-1, 64, 64, 64, 32);
-  e_DrawQuad(x, y, gScreenWidth-x-1, gScreenHeight-y-1, 255, 127, 0);
-
-  m := Max(Length(_lc[I_MENU_MAP])+1, Length(_lc[I_GAME_GAME_TIME])+1)*ww2;
-
-  case CustomStat.GameMode of
-    GM_DM:
-    begin
-      if gGameSettings.MaxLives = 0 then
-        s1 := _lc[I_GAME_DM]
-      else
-        s1 := _lc[I_GAME_LMS];
-    end;
-    GM_TDM:
-    begin
-      if gGameSettings.MaxLives = 0 then
-        s1 := _lc[I_GAME_TDM]
-      else
-        s1 := _lc[I_GAME_TLMS];
-    end;
-    GM_CTF: s1 := _lc[I_GAME_CTF];
-    GM_COOP:
-    begin
-      if gGameSettings.MaxLives = 0 then
-        s1 := _lc[I_GAME_COOP]
-      else
-        s1 := _lc[I_GAME_SURV];
-    end;
-    else s1 := '';
-  end;
-
-  _y := y+16;
-  e_TextureFontPrintEx(x+(w div 2)-(Length(s1)*ww2 div 2), _y, s1, gStdFont, 255, 255, 255, 1);
-  _y := _y+8;
-
-  _y := _y+16;
-  e_TextureFontPrintEx(x+8, _y, _lc[I_MENU_MAP], gStdFont, 255, 127, 0, 1);
-  e_TextureFontPrint(x+8+m, _y, Format('%s - %s', [CustomStat.Map, CustomStat.MapName]), gStdFont);
-
-  _y := _y+16;
-  e_TextureFontPrintEx(x+8, _y, _lc[I_GAME_GAME_TIME], gStdFont, 255, 127, 0, 1);
-  e_TextureFontPrint(x+8+m, _y, Format('%d:%.2d:%.2d', [CustomStat.GameTime div 1000 div 3600,
-                                                       (CustomStat.GameTime div 1000 div 60) mod 60,
-                                                        CustomStat.GameTime div 1000 mod 60]), gStdFont);
-
-  pc := Length(CustomStat.PlayerStat);
-  if pc = 0 then Exit;
-
-  if CustomStat.GameMode = GM_COOP then
-  begin
-    m := Max(Length(_lc[I_GAME_MONSTERS])+1, Length(_lc[I_GAME_SECRETS])+1)*ww2;
-    _y := _y+32;
-    s2 := _lc[I_GAME_MONSTERS];
-    e_TextureFontPrintEx(x+8, _y, s2, gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+8+m, _y, IntToStr(gCoopMonstersKilled) + '/' + IntToStr(gTotalMonsters), gStdFont, 255, 255, 255, 1);
-    _y := _y+16;
-    s2 := _lc[I_GAME_SECRETS];
-    e_TextureFontPrintEx(x+8, _y, s2, gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+8+m, _y, IntToStr(gCoopSecretsFound) + '/' + IntToStr(gSecretsCount), gStdFont, 255, 255, 255, 1);
-    if gLastMap then
-    begin
-      m := Max(Length(_lc[I_GAME_MONSTERS_TOTAL])+1, Length(_lc[I_GAME_SECRETS_TOTAL])+1)*ww2;
-      _y := _y-16;
-      s2 := _lc[I_GAME_MONSTERS_TOTAL];
-      e_TextureFontPrintEx(x+250, _y, s2, gStdFont, 255, 127, 0, 1);
-      e_TextureFontPrintEx(x+250+m, _y, IntToStr(gCoopTotalMonstersKilled) + '/' + IntToStr(gCoopTotalMonsters), gStdFont, 255, 255, 255, 1);
-      _y := _y+16;
-      s2 := _lc[I_GAME_SECRETS_TOTAL];
-      e_TextureFontPrintEx(x+250, _y, s2, gStdFont, 255, 127, 0, 1);
-      e_TextureFontPrintEx(x+250+m, _y, IntToStr(gCoopTotalSecretsFound) + '/' + IntToStr(gCoopTotalSecrets), gStdFont, 255, 255,  255, 1);
-    end;
-  end;
-
-  if CustomStat.GameMode in [GM_TDM, GM_CTF] then
-  begin
-    _y := _y+16+16;
-
-    with CustomStat do
-      if TeamStat[TEAM_RED].Goals > TeamStat[TEAM_BLUE].Goals then s1 := _lc[I_GAME_WIN_RED]
-        else if TeamStat[TEAM_BLUE].Goals > TeamStat[TEAM_RED].Goals then s1 := _lc[I_GAME_WIN_BLUE]
-          else s1 := _lc[I_GAME_WIN_DRAW];
-
-    e_TextureFontPrintEx(x+8+(w div 2)-(Length(s1)*ww2 div 2), _y, s1, gStdFont, 255, 255, 255, 1);
-    _y := _y+40;
-
-    for t := TEAM_RED to TEAM_BLUE do
-    begin
-      if t = TEAM_RED then
-      begin
-        e_TextureFontPrintEx(x+8, _y, _lc[I_GAME_TEAM_RED],
-                             gStdFont, 255, 0, 0, 1);
-        e_TextureFontPrintEx(x+w1+8, _y, IntToStr(CustomStat.TeamStat[TEAM_RED].Goals),
-                             gStdFont, 255, 0, 0, 1);
-        r := 255;
-        g := 0;
-        b := 0;
-      end
-      else
-      begin
-        e_TextureFontPrintEx(x+8, _y, _lc[I_GAME_TEAM_BLUE],
-                             gStdFont, 0, 0, 255, 1);
-        e_TextureFontPrintEx(x+w1+8, _y, IntToStr(CustomStat.TeamStat[TEAM_BLUE].Goals),
-                             gStdFont, 0, 0, 255, 1);
-        r := 0;
-        g := 0;
-        b := 255;
-      end;
-
-      e_DrawLine(1, x+8, _y+20, x-8+w, _y+20, r, g, b);
-      _y := _y+24;
-
-      for p := 0 to High(CustomStat.PlayerStat) do
-        if CustomStat.PlayerStat[p].Team = t then
-          with CustomStat.PlayerStat[p] do
-          begin
-            if Spectator then
-            begin
-              rr := r div 2;
-              gg := g div 2;
-              bb := b div 2;
-            end
-            else
-            begin
-              rr := r;
-              gg := g;
-              bb := b;
-            end;
-            e_TextureFontPrintEx(x+8, _y, Name, gStdFont, rr, gg, bb, 1);
-            e_TextureFontPrintEx(x+w1+8, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
-            e_TextureFontPrintEx(x+w1+w2+8, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
-            _y := _y+24;
-          end;
-
-      _y := _y+16+16;
-    end;
-  end
-  else if CustomStat.GameMode in [GM_DM, GM_COOP] then
-  begin
-    _y := _y+40;
-    e_TextureFontPrintEx(x+8, _y, _lc[I_GAME_PLAYER_NAME], gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+8+w1, _y, _lc[I_GAME_FRAGS], gStdFont, 255, 127, 0, 1);
-    e_TextureFontPrintEx(x+8+w1+w2, _y, _lc[I_GAME_DEATHS], gStdFont, 255, 127, 0, 1);
-
-    _y := _y+24;
-    for p := 0 to High(CustomStat.PlayerStat) do
-      with CustomStat.PlayerStat[p] do
-      begin
-        e_DrawFillQuad(x+8, _y+4, x+24-1, _y+16+4-1, Color.R, Color.G, Color.B, 0);
-
-        if Spectator then
-          r := 127
-        else
-          r := 255;
-
-        e_TextureFontPrintEx(x+8+16+8, _y+4, Name, gStdFont, r, r, r, 1, True);
-        e_TextureFontPrintEx(x+w1+8+16+8, _y+4, IntToStr(Frags), gStdFont, r, r, r, 1, True);
-        e_TextureFontPrintEx(x+w1+w2+8+16+8, _y+4, IntToStr(Deaths), gStdFont, r, r, r, 1, True);
-        _y := _y+24;
-      end;
-  end;
-end;
-
-procedure DrawSingleStat();
-var
-  tm, key_x, val_x, y: Integer;
-  w1, w2, h: Word;
-  s1, s2: String;
-
-  procedure player_stat(n: Integer);
-  var
-    kpm: Real;
-
-  begin
-  // "Kills: # / #":
-    s1 := Format(' %d ', [SingleStat.PlayerStat[n].Kills]);
-    s2 := Format(' %d', [gTotalMonsters]);
-
-    e_CharFont_Print(gMenuFont, key_x, y, _lc[I_MENU_INTER_KILLS]);
-    e_CharFont_PrintEx(gMenuFont, val_x, y, s1, _RGB(255, 0, 0));
-    e_CharFont_GetSize(gMenuFont, s1, w1, h);
-    e_CharFont_Print(gMenuFont, val_x+w1, y, '/');
-    s1 := s1 + '/';
-    e_CharFont_GetSize(gMenuFont, s1, w1, h);
-    e_CharFont_PrintEx(gMenuFont, val_x+w1, y, s2, _RGB(255, 0, 0));
-
-  // "Kills-per-minute: ##.#":
-    s1 := _lc[I_MENU_INTER_KPM];
-    if tm > 0 then
-      kpm := (SingleStat.PlayerStat[n].Kills / tm) * 60
-    else
-      kpm := SingleStat.PlayerStat[n].Kills;
-    s2 := Format(' %.1f', [kpm]);
-
-    e_CharFont_Print(gMenuFont, key_x, y+32, s1);
-    e_CharFont_PrintEx(gMenuFont, val_x, y+32, s2, _RGB(255, 0, 0));
-
-  // "Secrets found: # / #":
-    s1 := Format(' %d ', [SingleStat.PlayerStat[n].Secrets]);
-    s2 := Format(' %d', [SingleStat.TotalSecrets]);
-
-    e_CharFont_Print(gMenuFont, key_x, y+64, _lc[I_MENU_INTER_SECRETS]);
-    e_CharFont_PrintEx(gMenuFont, val_x, y+64, s1, _RGB(255, 0, 0));
-    e_CharFont_GetSize(gMenuFont, s1, w1, h);
-    e_CharFont_Print(gMenuFont, val_x+w1, y+64, '/');
-    s1 := s1 + '/';
-    e_CharFont_GetSize(gMenuFont, s1, w1, h);
-    e_CharFont_PrintEx(gMenuFont, val_x+w1, y+64, s2, _RGB(255, 0, 0));
-  end;
-
-begin
-// "Level Complete":
-  e_CharFont_GetSize(gMenuFont, _lc[I_MENU_INTER_LEVEL_COMPLETE], w1, h);
-  e_CharFont_Print(gMenuFont, (gScreenWidth-w1) div 2, 32, _lc[I_MENU_INTER_LEVEL_COMPLETE]);
-
-// Îïðåäåëÿåì êîîðäèíàòû âûðàâíèâàíèÿ ïî ñàìîé äëèííîé ñòðîêå:
-  s1 := _lc[I_MENU_INTER_KPM];
-  e_CharFont_GetSize(gMenuFont, s1, w1, h);
-  Inc(w1, 16);
-  s1 := ' 9999.9';
-  e_CharFont_GetSize(gMenuFont, s1, w2, h);
-
-  key_x := (gScreenWidth-w1-w2) div 2;
-  val_x := key_x + w1;
-
-// "Time: #:##:##":
-  tm := SingleStat.GameTime div 1000;
-  s1 := _lc[I_MENU_INTER_TIME];
-  s2 := Format(' %d:%.2d:%.2d', [tm div (60*60), (tm mod (60*60)) div 60, tm mod 60]);
-
-  e_CharFont_Print(gMenuFont, key_x, 80, s1);
-  e_CharFont_PrintEx(gMenuFont, val_x, 80, s2, _RGB(255, 0, 0));
-
-  if SingleStat.TwoPlayers then
-    begin
-    // "Player 1":
-      s1 := _lc[I_MENU_PLAYER_1];
-      e_CharFont_GetSize(gMenuFont, s1, w1, h);
-      e_CharFont_Print(gMenuFont, (gScreenWidth-w1) div 2, 128, s1);
-
-    // Ñòàòèñòèêà ïåðâîãî èãðîêà:
-      y := 176;
-      player_stat(0);
-
-    // "Player 2":
-      s1 := _lc[I_MENU_PLAYER_2];
-      e_CharFont_GetSize(gMenuFont, s1, w1, h);
-      e_CharFont_Print(gMenuFont, (gScreenWidth-w1) div 2, 288, s1);
-
-    // Ñòàòèñòèêà âòîðîãî èãðîêà:
-      y := 336;
-      player_stat(1);
-    end
-  else
-    begin
-    // Ñòàòèñòèêà ïåðâîãî èãðîêà:
-      y := 128;
-      player_stat(0);
-    end;
-end;
-
-procedure DrawLoadingStat();
-var
-  ww, hh: Word;
-  xx, yy, i: Integer;
-  s: String;
-begin
-  if Length(LoadingStat.Msgs) = 0 then
-    Exit;
-
-  e_CharFont_GetSize(gMenuFont, _lc[I_MENU_LOADING], ww, hh);
-  yy := (gScreenHeight div 3);
-  e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(ww div 2), yy-2*hh, _lc[I_MENU_LOADING]);
-  xx := (gScreenWidth div 3);
-
-  with LoadingStat do
-    for i := 0 to NextMsg-1 do
-      begin
-        if (i = (NextMsg-1)) and (MaxValue > 0) then
-          s := Format('%s:  %d/%d', [Msgs[i], CurValue, MaxValue])
-        else
-          s := Msgs[i];
-
-        e_CharFont_PrintEx(gMenuSmallFont, xx, yy, s, _RGB(255, 0, 0));
-        yy := yy + LOADING_INTERLINE;
-      end;
-end;
-
-procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
-var
-  a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;
-
-  function monDraw (mon: TMonster): Boolean;
-  begin
-    result := false; // don't stop
-    with mon do
-    begin
-      if Live then
-      begin
-        // Ëåâûé âåðõíèé óãîë
-        aX := Obj.X div ScaleSz + 1;
-        aY := Obj.Y div ScaleSz + 1;
-        // Ðàçìåðû
-        aX2 := max(Obj.Rect.Width div ScaleSz, 1);
-        aY2 := max(Obj.Rect.Height div ScaleSz, 1);
-        // Ïðàâûé íèæíèé óãîë
-        aX2 := aX + aX2 - 1;
-        aY2 := aY + aY2 - 1;
-        e_DrawFillQuad(aX, aY, aX2, aY2, 255, 255, 0, 0);
-      end;
-    end;
-  end;
-
-begin
-  if (gMapInfo.Width > RenderRect.Right - RenderRect.Left) or
-     (gMapInfo.Height > RenderRect.Bottom - RenderRect.Top) then
-  begin
-    Scale := 1;
-  // Ñêîëüêî ïèêñåëîâ êàðòû â 1 ïèêñåëå ìèíè-êàðòû:
-    ScaleSz := 16 div Scale;
-  // Ðàçìåðû ìèíè-êàðòû:
-    aX := max(gMapInfo.Width div ScaleSz, 1);
-    aY := max(gMapInfo.Height div ScaleSz, 1);
-  // Ðàìêà êàðòû:
-    e_DrawFillQuad(0, 0, aX-1, aY-1, 0, 0, 0, 0);
-
-    if gWalls <> nil then
-    begin
-    // Ðèñóåì ñòåíû:
-      for a := 0 to High(gWalls) do
-        with gWalls[a] do
-          if PanelType <> 0 then
-          begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := X div ScaleSz;
-            aY := Y div ScaleSz;
-          // Ðàçìåðû:
-            aX2 := max(Width div ScaleSz, 1);
-            aY2 := max(Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            case PanelType of
-              PANEL_WALL:      e_DrawFillQuad(aX, aY, aX2, aY2, 208, 208, 208, 0);
-              PANEL_OPENDOOR, PANEL_CLOSEDOOR:
-                if Enabled then e_DrawFillQuad(aX, aY, aX2, aY2, 160, 160, 160, 0);
-            end;
-          end;
-    end;
-    if gSteps <> nil then
-    begin
-    // Ðèñóåì ñòóïåíè:
-      for a := 0 to High(gSteps) do
-        with gSteps[a] do
-          if PanelType <> 0 then
-          begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := X div ScaleSz;
-            aY := Y div ScaleSz;
-          // Ðàçìåðû:
-            aX2 := max(Width div ScaleSz, 1);
-            aY2 := max(Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            e_DrawFillQuad(aX, aY, aX2, aY2, 128, 128, 128, 0);
-          end;
-    end;
-    if gLifts <> nil then
-    begin
-    // Ðèñóåì ëèôòû:
-      for a := 0 to High(gLifts) do
-        with gLifts[a] do
-          if PanelType <> 0 then
-          begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := X div ScaleSz;
-            aY := Y div ScaleSz;
-          // Ðàçìåðû:
-            aX2 := max(Width div ScaleSz, 1);
-            aY2 := max(Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            case LiftType of
-              0: e_DrawFillQuad(aX, aY, aX2, aY2, 116,  72,  36, 0);
-              1: e_DrawFillQuad(aX, aY, aX2, aY2, 116, 124,  96, 0);
-              2: e_DrawFillQuad(aX, aY, aX2, aY2, 200,  80,   4, 0);
-              3: e_DrawFillQuad(aX, aY, aX2, aY2, 252, 140,  56, 0);
-            end;
-          end;
-    end;
-    if gWater <> nil then
-    begin
-    // Ðèñóåì âîäó:
-      for a := 0 to High(gWater) do
-        with gWater[a] do
-          if PanelType <> 0 then
-          begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := X div ScaleSz;
-            aY := Y div ScaleSz;
-          // Ðàçìåðû:
-            aX2 := max(Width div ScaleSz, 1);
-            aY2 := max(Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            e_DrawFillQuad(aX, aY, aX2, aY2, 0, 0, 192, 0);
-          end;
-    end;
-    if gAcid1 <> nil then
-    begin
-    // Ðèñóåì êèñëîòó 1:
-      for a := 0 to High(gAcid1) do
-        with gAcid1[a] do
-          if PanelType <> 0 then
-          begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := X div ScaleSz;
-            aY := Y div ScaleSz;
-          // Ðàçìåðû:
-            aX2 := max(Width div ScaleSz, 1);
-            aY2 := max(Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            e_DrawFillQuad(aX, aY, aX2, aY2, 0, 176, 0, 0);
-          end;
-    end;
-    if gAcid2 <> nil then
-    begin
-    // Ðèñóåì êèñëîòó 2:
-      for a := 0 to High(gAcid2) do
-        with gAcid2[a] do
-          if PanelType <> 0 then
-          begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := X div ScaleSz;
-            aY := Y div ScaleSz;
-          // Ðàçìåðû:
-            aX2 := max(Width div ScaleSz, 1);
-            aY2 := max(Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            e_DrawFillQuad(aX, aY, aX2, aY2, 176, 0, 0, 0);
-          end;
-    end;
-    if gPlayers <> nil then
-    begin
-    // Ðèñóåì èãðîêîâ:
-      for a := 0 to High(gPlayers) do
-        if gPlayers[a] <> nil then with gPlayers[a] do
-          if Live then begin
-          // Ëåâûé âåðõíèé óãîë:
-            aX := Obj.X div ScaleSz + 1;
-            aY := Obj.Y div ScaleSz + 1;
-          // Ðàçìåðû:
-            aX2 := max(Obj.Rect.Width div ScaleSz, 1);
-            aY2 := max(Obj.Rect.Height div ScaleSz, 1);
-          // Ïðàâûé íèæíèé óãîë:
-            aX2 := aX + aX2 - 1;
-            aY2 := aY + aY2 - 1;
-
-            if gPlayers[a] = p then
-              e_DrawFillQuad(aX, aY, aX2, aY2, 0, 255, 0, 0)
-            else
-              case Team of
-                TEAM_RED:  e_DrawFillQuad(aX, aY, aX2, aY2, 255,   0,   0, 0);
-                TEAM_BLUE: e_DrawFillQuad(aX, aY, aX2, aY2, 0,     0, 255, 0);
-                else       e_DrawFillQuad(aX, aY, aX2, aY2, 255, 128,   0, 0);
-              end;
-          end;
-    end;
-    // Ðèñóåì ìîíñòðîâ
-    g_Mons_ForEach(monDraw);
-  end;
-end;
-
-
-// setup sX, sY, sWidth, sHeight, and transformation matrix before calling this!
-procedure renderDynLightsInternal ();
-var
-  lln: Integer;
-  lx, ly, lrad: Integer;
-begin
-  //TODO: lights should be in separate grid, i think
-  //      but on the other side: grid may be slower for dynlights, as their lifetime is short
-  if not gwin_has_stencil or (g_dynLightCount < 1) then exit;
-
-  // setup OpenGL parameters
-  glStencilMask($FFFFFFFF);
-  glStencilFunc(GL_ALWAYS, 0, $FFFFFFFF);
-  glEnable(GL_STENCIL_TEST);
-  glEnable(GL_SCISSOR_TEST);
-  glClear(GL_STENCIL_BUFFER_BIT);
-  glStencilFunc(GL_EQUAL, 0, $ff);
-
-  for lln := 0 to g_dynLightCount-1 do
-  begin
-    lx := g_dynLights[lln].x;
-    ly := g_dynLights[lln].y;
-    lrad := g_dynLights[lln].radius;
-    if lrad < 3 then continue;
-
-    if lx-sX+lrad < 0 then continue;
-    if ly-sY+lrad < 0 then continue;
-    if lx-sX-lrad >= gPlayerScreenSize.X then continue;
-    if ly-sY-lrad >= gPlayerScreenSize.Y then continue;
-
-    // set scissor to optimize drawing
-    //FIXME: broken for splitscreen mode
-    glScissor((lx-sX)-lrad+2, gPlayerScreenSize.Y-(ly-sY)-lrad-1+2, lrad*2-4, lrad*2-4);
-    // no need to clear stencil buffer, light blitting will do it for us
-    glStencilOp(GL_KEEP, GL_KEEP, GL_INCR);
-    // draw extruded panels
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_BLEND);
-    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // no need to modify color buffer
-    if (lrad > 4) then g_Map_DrawPanelShadowVolumes(lx, ly, lrad);
-    // render light texture
-    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer
-    glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO); // draw light, and clear stencil buffer
-    // blend it
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glEnable(GL_TEXTURE_2D);
-    // color and opacity
-    glColor4f(g_dynLights[lln].r, g_dynLights[lln].g, g_dynLights[lln].b, g_dynLights[lln].a);
-    glBindTexture(GL_TEXTURE_2D, g_Texture_Light());
-    glBegin(GL_QUADS);
-      glTexCoord2f(0.0, 0.0); glVertex2i(lx-lrad, ly-lrad); // top-left
-      glTexCoord2f(1.0, 0.0); glVertex2i(lx+lrad, ly-lrad); // top-right
-      glTexCoord2f(1.0, 1.0); glVertex2i(lx+lrad, ly+lrad); // bottom-right
-      glTexCoord2f(0.0, 1.0); glVertex2i(lx-lrad, ly+lrad); // bottom-left
-    glEnd();
-  end;
-
-  // done
-  glDisable(GL_STENCIL_TEST);
-  glDisable(GL_BLEND);
-  glDisable(GL_SCISSOR_TEST);
-  glScissor(0, 0, sWidth, sHeight);
-end;
-
-
-// setup sX, sY, sWidth, sHeight, and transformation matrix before calling this!
-// WARNING! this WILL CALL `glTranslatef()`, but won't restore matrices!
-procedure renderMapInternal (backXOfs, backYOfs: Integer; transX, transY: Integer; setTransMatrix: Boolean);
-type
-  TDrawCB = procedure ();
-
-  procedure drawPanelType (profname: AnsiString; panType: DWord; doDraw: Boolean);
-  var
-    tagmask: Integer;
-    pan: TPanel;
-  begin
-    profileFrameDraw.sectionBegin(profname);
-    if gdbg_map_use_accel_render then
-    begin
-      tagmask := panelTypeToTag(panType);
-      while (gDrawPanelList.count > 0) do
-      begin
-        pan := TPanel(gDrawPanelList.front());
-        if ((pan.tag and tagmask) = 0) then break;
-        if doDraw then pan.Draw();
-        gDrawPanelList.popFront();
-      end;
-    end
-    else
-    begin
-      if doDraw then g_Map_DrawPanels(panType);
-    end;
-    profileFrameDraw.sectionEnd();
-  end;
-
-  procedure drawOther (profname: AnsiString; cb: TDrawCB);
-  begin
-    profileFrameDraw.sectionBegin(profname);
-    if assigned(cb) then cb();
-    profileFrameDraw.sectionEnd();
-  end;
-
-begin
-  profileFrameDraw.sectionBegin('total');
-
-  // our accelerated renderer will collect all panels to gDrawPanelList
-  // we can use panel tag to render level parts (see GridTagXXX in g_map.pas)
-  profileFrameDraw.sectionBegin('collect');
-  if gdbg_map_use_accel_render then
-  begin
-    g_Map_CollectDrawPanels(sX, sY, sWidth, sHeight);
-  end;
-  profileFrameDraw.sectionEnd();
-
-  profileFrameDraw.sectionBegin('skyback');
-  g_Map_DrawBack(backXOfs, backYOfs);
-  profileFrameDraw.sectionEnd();
-
-  if (setTransMatrix) then glTranslatef(transX, transY, 0);
-
-  drawPanelType('*back', PANEL_BACK, g_rlayer_back);
-  drawPanelType('*step', PANEL_STEP, g_rlayer_step);
-  drawOther('items', @g_Items_Draw);
-  drawOther('weapons', @g_Weapon_Draw);
-  drawOther('shells', @g_Player_DrawShells);
-  drawOther('drawall', @g_Player_DrawAll);
-  drawOther('corpses', @g_Player_DrawCorpses);
-  drawPanelType('*wall', PANEL_WALL, g_rlayer_wall);
-  drawOther('monsters', @g_Monsters_Draw);
-  drawPanelType('*door', PANEL_CLOSEDOOR, g_rlayer_door);
-  drawOther('gfx', @g_GFX_Draw);
-  drawOther('flags', @g_Map_DrawFlags);
-  drawPanelType('*acid1', PANEL_ACID1, g_rlayer_acid1);
-  drawPanelType('*acid2', PANEL_ACID2, g_rlayer_acid2);
-  drawPanelType('*water', PANEL_WATER, g_rlayer_water);
-  drawOther('dynlights', @renderDynLightsInternal);
-  drawPanelType('*fore', PANEL_FORE, g_rlayer_fore);
-
-  if g_debug_HealthBar then
-  begin
-    g_Monsters_DrawHealth();
-    g_Player_DrawHealth();
-  end;
-
-  profileFrameDraw.mainEnd(); // map rendering
-end;
-
-
-procedure DrawMapView(x, y, w, h: Integer);
-
-var
-  bx, by: Integer;
-begin
-  glPushMatrix();
-
-  bx := Round(x/(gMapInfo.Width - w)*(gBackSize.X - w));
-  by := Round(y/(gMapInfo.Height - h)*(gBackSize.Y - h));
-
-  sX := x;
-  sY := y;
-  sWidth := w;
-  sHeight := h;
-
-  renderMapInternal(-bx, -by, -x, -y, true);
-
-  glPopMatrix();
-end;
-
-
-procedure DrawPlayer(p: TPlayer);
-var
-  px, py, a, b, c, d: Integer;
-  //R: TRect;
-
-begin
-  if (p = nil) or (p.FDummy) then
-  begin
-    glPushMatrix();
-    g_Map_DrawBack(0, 0);
-    glPopMatrix();
-    Exit;
-  end;
-
-  if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('RENDER', g_profile_history_size);
-  profileFrameDraw.mainBegin(g_profile_frame_draw);
-
-  gPlayerDrawn := p;
-
-  glPushMatrix();
-
-  px := p.GameX + PLAYER_RECT_CX;
-  py := p.GameY + PLAYER_RECT_CY;
-
-  if px > (gPlayerScreenSize.X div 2) then a := -px+(gPlayerScreenSize.X div 2) else a := 0;
-  if py > (gPlayerScreenSize.Y div 2) then b := -py+(gPlayerScreenSize.Y div 2) else b := 0;
-
-  if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X;
-  if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y;
-
-       if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0
-  else if (gMapInfo.Width < gPlayerScreenSize.X) then
-  begin
-    // hcenter
-    a := (gPlayerScreenSize.X-gMapInfo.Width) div 2;
-  end;
-
-       if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0
-  else if (gMapInfo.Height < gPlayerScreenSize.Y) then
-  begin
-    // vcenter
-    b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2;
-  end;
-
-  if p.IncCam <> 0 then
-  begin
-    if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then
-    begin
-      if p.IncCam > 120-(py-(gMapInfo.Height-(gPlayerScreenSize.Y div 2))) then
-      begin
-        p.IncCam := 120-(py-(gMapInfo.Height-(gPlayerScreenSize.Y div 2)));
-      end;
-    end;
-
-    if py < gPlayerScreenSize.Y div 2 then
-    begin
-      if p.IncCam < -120+((gPlayerScreenSize.Y div 2)-py) then
-      begin
-        p.IncCam := -120+((gPlayerScreenSize.Y div 2)-py);
-      end;
-    end;
-
-    if p.IncCam < 0 then
-    begin
-      while (py+(gPlayerScreenSize.Y div 2)-p.IncCam > gMapInfo.Height) and (p.IncCam < 0) do p.IncCam := p.IncCam+1; //Inc(p.IncCam);
-    end;
-
-    if p.IncCam > 0 then
-    begin
-      while (py-(gPlayerScreenSize.Y div 2)-p.IncCam < 0) and (p.IncCam > 0) do p.IncCam := p.IncCam-1; //Dec(p.IncCam);
-    end;
-  end;
-
-       if (px < gPlayerScreenSize.X div 2) or (gMapInfo.Width-gPlayerScreenSize.X <= 256) then c := 0
-  else if (px > gMapInfo.Width-(gPlayerScreenSize.X div 2)) then c := gBackSize.X-gPlayerScreenSize.X
-  else c := round((px-(gPlayerScreenSize.X div 2))/(gMapInfo.Width-gPlayerScreenSize.X)*(gBackSize.X-gPlayerScreenSize.X));
-
-       if (py-p.IncCam <= gPlayerScreenSize.Y div 2) or (gMapInfo.Height-gPlayerScreenSize.Y <= 256) then d := 0
-  else if (py-p.IncCam >= gMapInfo.Height-(gPlayerScreenSize.Y div 2)) then d := gBackSize.Y-gPlayerScreenSize.Y
-  else d := round((py-p.IncCam-(gPlayerScreenSize.Y div 2))/(gMapInfo.Height-gPlayerScreenSize.Y)*(gBackSize.Y-gPlayerScreenSize.Y));
-
-  sX := -a;
-  sY := -(b+p.IncCam);
-  sWidth := gPlayerScreenSize.X;
-  sHeight := gPlayerScreenSize.Y;
-
-  //glTranslatef(a, b+p.IncCam, 0);
-
-  p.viewPortX := sX;
-  p.viewPortY := sY;
-  p.viewPortW := sWidth;
-  p.viewPortH := sHeight;
-
-  if (p = gPlayer1) then
-  begin
-    g_Holmes_plrView(p.viewPortX, p.viewPortY, p.viewPortW, p.viewPortH);
-  end;
-
-  renderMapInternal(-c, -d, a, b+p.IncCam, true);
-
-  if p.FSpectator then
-    e_TextureFontPrintEx(p.GameX + PLAYER_RECT_CX - 4,
-                         p.GameY + PLAYER_RECT_CY - 4,
-                         'X', gStdFont, 255, 255, 255, 1, True);
-  {
-  for a := 0 to High(gCollideMap) do
-    for b := 0 to High(gCollideMap[a]) do
-    begin
-      d := 0;
-      if ByteBool(gCollideMap[a, b] and MARK_WALL) then
-        d := d + 1;
-      if ByteBool(gCollideMap[a, b] and MARK_DOOR) then
-        d := d + 2;
-
-      case d of
-        1: e_DrawPoint(1, b, a, 200, 200, 200);
-        2: e_DrawPoint(1, b, a, 64, 64, 255);
-        3: e_DrawPoint(1, b, a, 255, 0, 255);
-      end;
-    end;
-  }
-
-  glPopMatrix();
-
-  p.DrawPain();
-  p.DrawPickup();
-  p.DrawRulez();
-  if gShowMap then DrawMinimap(p, _TRect(0, 0, 128, 128));
-  if g_Debug_Player then
-    g_Player_DrawDebug(p);
-  p.DrawGUI();
-end;
-
-procedure drawProfilers ();
-var
-  px: Integer = -1;
-  py: Integer = -1;
-begin
-  if g_profile_frame_draw then px := px-drawProfiles(px, py, profileFrameDraw);
-  if g_profile_collision then begin px := px-drawProfiles(px, py, profMapCollision); py -= calcProfilesHeight(profMonsLOS); end;
-  if g_profile_los then begin px := px-drawProfiles(px, py, profMonsLOS); py -= calcProfilesHeight(profMonsLOS); end;
-end;
-
-procedure g_Game_Draw();
-var
-  ID: DWORD;
-  w, h: Word;
-  ww, hh: Byte;
-  Time: Int64;
-  back: string;
-  plView1, plView2: TPlayer;
-  Split: Boolean;
-begin
-  if gExit = EXIT_QUIT then Exit;
-
-  Time := GetTimer() {div 1000};
-  FPSCounter := FPSCounter+1;
-  if Time - FPSTime >= 1000 then
-  begin
-    FPS := FPSCounter;
-    FPSCounter := 0;
-    FPSTime := Time;
-  end;
-
-  if gGameOn or (gState = STATE_FOLD) then
-  begin
-    if (gPlayer1 <> nil) and (gPlayer2 <> nil) then
-    begin
-      gSpectMode := SPECT_NONE;
-      if not gRevertPlayers then
-      begin
-        plView1 := gPlayer1;
-        plView2 := gPlayer2;
-      end
-      else
-      begin
-        plView1 := gPlayer2;
-        plView2 := gPlayer1;
-      end;
-    end
-    else
-      if (gPlayer1 <> nil) or (gPlayer2 <> nil) then
-      begin
-        gSpectMode := SPECT_NONE;
-        if gPlayer2 = nil then
-          plView1 := gPlayer1
-        else
-          plView1 := gPlayer2;
-        plView2 := nil;
-      end
-      else
-      begin
-        plView1 := nil;
-        plView2 := nil;
-      end;
-
-    if (plView1 = nil) and (plView2 = nil) and (gSpectMode = SPECT_NONE) then
-      gSpectMode := SPECT_STATS;
-
-    if gSpectMode = SPECT_PLAYERS then
-      if gPlayers <> nil then
-      begin
-        plView1 := GetActivePlayer_ByID(gSpectPID1);
-        if plView1 = nil then
-        begin
-          gSpectPID1 := GetActivePlayerID_Next();
-          plView1 := GetActivePlayer_ByID(gSpectPID1);
-        end;
-        if gSpectViewTwo then
-        begin
-          plView2 := GetActivePlayer_ByID(gSpectPID2);
-          if plView2 = nil then
-          begin
-            gSpectPID2 := GetActivePlayerID_Next();
-            plView2 := GetActivePlayer_ByID(gSpectPID2);
-          end;
-        end;
-      end;
-
-    if gSpectMode = SPECT_MAPVIEW then
-    begin
-    // Ðåæèì ïðîñìîòðà êàðòû
-      Split := False;
-      e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
-      DrawMapView(gSpectX, gSpectY, gScreenWidth, gScreenHeight);
-      gHearPoint1.Active := True;
-      gHearPoint1.Coords.X := gScreenWidth div 2 + gSpectX;
-      gHearPoint1.Coords.Y := gScreenHeight div 2 + gSpectY;
-      gHearPoint2.Active := False;
-    end
-    else
-    begin
-      Split := (plView1 <> nil) and (plView2 <> nil);
-
-    // Òî÷êè ñëóõà èãðîêîâ
-      if plView1 <> nil then
-      begin
-        gHearPoint1.Active := True;
-        gHearPoint1.Coords.X := plView1.GameX;
-        gHearPoint1.Coords.Y := plView1.GameY;
-      end else
-        gHearPoint1.Active := False;
-      if plView2 <> nil then
-      begin
-        gHearPoint2.Active := True;
-        gHearPoint2.Coords.X := plView2.GameX;
-        gHearPoint2.Coords.Y := plView2.GameY;
-      end else
-        gHearPoint2.Active := False;
-
-    // Ðàçìåð ýêðàíîâ èãðîêîâ:
-      gPlayerScreenSize.X := gScreenWidth-196;
-      if Split then
-      begin
-        gPlayerScreenSize.Y := gScreenHeight div 2;
-        if gScreenHeight mod 2 = 0 then
-          Dec(gPlayerScreenSize.Y);
-      end
-      else
-        gPlayerScreenSize.Y := gScreenHeight;
-
-      if Split then
-        if gScreenHeight mod 2 = 0 then
-          e_SetViewPort(0, gPlayerScreenSize.Y+2, gPlayerScreenSize.X+196, gPlayerScreenSize.Y)
-        else
-          e_SetViewPort(0, gPlayerScreenSize.Y+1, gPlayerScreenSize.X+196, gPlayerScreenSize.Y);
-
-      DrawPlayer(plView1);
-      gPlayer1ScreenCoord.X := sX;
-      gPlayer1ScreenCoord.Y := sY;
-
-      if Split then
-      begin
-        e_SetViewPort(0, 0, gPlayerScreenSize.X+196, gPlayerScreenSize.Y);
-
-        DrawPlayer(plView2);
-        gPlayer2ScreenCoord.X := sX;
-        gPlayer2ScreenCoord.Y := sY;
-      end;
-
-      e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
-
-      if Split then
-        e_DrawLine(2, 0, gScreenHeight div 2, gScreenWidth, gScreenHeight div 2, 0, 0, 0);
-    end;
-
-    if MessageText <> '' then
-    begin
-      w := 0;
-      h := 0;
-      e_CharFont_GetSizeFmt(gMenuFont, MessageText, w, h);
-      if Split then
-        e_CharFont_PrintFmt(gMenuFont, (gScreenWidth div 2)-(w div 2),
-                        (gScreenHeight div 2)-(h div 2), MessageText)
-      else
-        e_CharFont_PrintFmt(gMenuFont, (gScreenWidth div 2)-(w div 2),
-                  Round(gScreenHeight / 2.75)-(h div 2), MessageText);
-    end;
-
-    if IsDrawStat or (gSpectMode = 1) then DrawStat();
-
-    if gSpectHUD and (not gChatShow) and (gSpectMode <> SPECT_NONE) then
-    begin
-    // Draw spectator GUI
-      ww := 0;
-      hh := 0;
-      e_TextureFontGetSize(gStdFont, ww, hh);
-      case gSpectMode of
-        SPECT_STATS:
-          e_TextureFontPrintEx(0, gScreenHeight - (hh+2)*2, 'MODE: Stats', gStdFont, 255, 255, 255, 1);
-        SPECT_MAPVIEW:
-          e_TextureFontPrintEx(0, gScreenHeight - (hh+2)*2, 'MODE: Observe Map', gStdFont, 255, 255, 255, 1);
-        SPECT_PLAYERS:
-          e_TextureFontPrintEx(0, gScreenHeight - (hh+2)*2, 'MODE: Watch Players', gStdFont, 255, 255, 255, 1);
-      end;
-      e_TextureFontPrintEx(2*ww, gScreenHeight - (hh+2), '< jump >', gStdFont, 255, 255, 255, 1);
-      if gSpectMode = SPECT_MAPVIEW then
-      begin
-        e_TextureFontPrintEx(22*ww, gScreenHeight - (hh+2)*2, '[-]', gStdFont, 255, 255, 255, 1);
-        e_TextureFontPrintEx(26*ww, gScreenHeight - (hh+2)*2, 'Step ' + IntToStr(gSpectStep), gStdFont, 255, 255, 255, 1);
-        e_TextureFontPrintEx(34*ww, gScreenHeight - (hh+2)*2, '[+]', gStdFont, 255, 255, 255, 1);
-        e_TextureFontPrintEx(18*ww, gScreenHeight - (hh+2), '<prev weap>', gStdFont, 255, 255, 255, 1);
-        e_TextureFontPrintEx(30*ww, gScreenHeight - (hh+2), '<next weap>', gStdFont, 255, 255, 255, 1);
-      end;
-      if gSpectMode = SPECT_PLAYERS then
-      begin
-        e_TextureFontPrintEx(22*ww, gScreenHeight - (hh+2)*2, 'Player 1', gStdFont, 255, 255, 255, 1);
-        e_TextureFontPrintEx(20*ww, gScreenHeight - (hh+2), '<left/right>', gStdFont, 255, 255, 255, 1);
-        if gSpectViewTwo then
-        begin
-          e_TextureFontPrintEx(37*ww, gScreenHeight - (hh+2)*2, 'Player 2', gStdFont, 255, 255, 255, 1);
-          e_TextureFontPrintEx(34*ww, gScreenHeight - (hh+2), '<prev w/next w>', gStdFont, 255, 255, 255, 1);
-          e_TextureFontPrintEx(52*ww, gScreenHeight - (hh+2)*2, '2x View', gStdFont, 255, 255, 255, 1);
-          e_TextureFontPrintEx(51*ww, gScreenHeight - (hh+2), '<up/down>', gStdFont, 255, 255, 255, 1);
-        end
-        else
-        begin
-          e_TextureFontPrintEx(35*ww, gScreenHeight - (hh+2)*2, '2x View', gStdFont, 255, 255, 255, 1);
-          e_TextureFontPrintEx(34*ww, gScreenHeight - (hh+2), '<up/down>', gStdFont, 255, 255, 255, 1);
-        end;
-      end;
-    end;
-  end;
-
-  if gPause and gGameOn and (g_ActiveWindow = nil) then
-  begin
-    //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-    e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-
-    e_CharFont_GetSize(gMenuFont, _lc[I_MENU_PAUSE], w, h);
-    e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(w div 2),
-                    (gScreenHeight div 2)-(h div 2), _lc[I_MENU_PAUSE]);
-  end;
-
-  if not gGameOn then
-  begin
-    if (gState = STATE_MENU) then
-    begin
-      if  ((g_ActiveWindow = nil) or (g_ActiveWindow.BackTexture = '')) then
-      begin
-        if g_Texture_Get('MENU_BACKGROUND', ID) then
-          e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
-        else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
-      end;
-      if g_ActiveWindow <> nil then
-      begin
-        //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-        e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      end;
-    end;
-
-    if gState = STATE_FOLD then
-    begin
-      e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter);
-    end;
-
-    if gState = STATE_INTERCUSTOM then
-    begin
-      if gLastMap and (gGameSettings.GameMode = GM_COOP) then
-      begin
-        back := 'TEXTURE_endpic';
-        if not g_Texture_Get(back, ID) then
-          back := _lc[I_TEXTURE_ENDPIC];
-      end
-      else
-        back := 'INTER';
-
-      if g_Texture_Get(back, ID) then
-        e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
-      else
-        e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
-
-      DrawCustomStat();
-
-      if g_ActiveWindow <> nil then
-      begin
-        //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-        e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      end;
-    end;
-
-    if gState = STATE_INTERSINGLE then
-    begin
-      if EndingGameCounter > 0 then
-      begin
-        e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter);
-      end
-      else
-      begin
-        back := 'INTER';
-
-        if g_Texture_Get(back, ID) then
-          e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
-        else
-          e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
-
-        DrawSingleStat();
-
-        if g_ActiveWindow <> nil then
-        begin
-          //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-          e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-        end;
-      end;
-    end;
-
-    if gState = STATE_ENDPIC then
-    begin
-      ID := DWORD(-1);
-      if not g_Texture_Get('TEXTURE_endpic', ID) then
-        g_Texture_Get(_lc[I_TEXTURE_ENDPIC], ID);
-
-      if ID <> DWORD(-1) then
-        e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
-      else
-        e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
-
-      if g_ActiveWindow <> nil then
-      begin
-        //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-        e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      end;
-    end;
-
-    if gState = STATE_SLIST then
-    begin
-      if g_Texture_Get('MENU_BACKGROUND', ID) then
-      begin
-        e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight);
-        //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-        e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      end;
-      g_Serverlist_Draw(slCurrent);
-    end;
-  end;
+  if NetInitDone then g_Net_Free;

 
 

-  if g_ActiveWindow <> nil then
-  begin
-    if gGameOn then
-    begin
-      //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
-      e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-    end;
-    g_ActiveWindow.Draw();
-  end;
+// remove map after test
+  if gMapToDelete <> '' then
+    g_Game_DeleteTestMap();

 
 

-  // draw inspector
-  if (g_holmes_enabled) then g_Holmes_Draw();
+  gExit := EXIT_QUIT;
+  sys_RequestQuit;
+end;

 
 

-  g_Console_Draw();
+procedure g_Game_FreeData();
+begin
+  if not DataLoaded then Exit;

 
 

-  if g_debug_Sounds and gGameOn then
-  begin
-    for w := 0 to High(e_SoundsArray) do
-      for h := 0 to e_SoundsArray[w].nRefs do
-        e_DrawPoint(1, w+100, h+100, 255, 0, 0);
-  end;
+  g_Items_FreeData();
+  g_Weapon_FreeData();
+  g_Monsters_FreeData();

 
 

-  if gShowFPS then
-  begin
-    e_TextureFontPrint(0, 0, Format('FPS: %d', [FPS]), gStdFont);
-    e_TextureFontPrint(0, 16, Format('UPS: %d', [UPS]), gStdFont);
-  end;
+  e_WriteLog('Releasing game data...', TMsgType.Notify);

 
 

-  if gGameOn and gShowTime and (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT]) then
-    drawTime(gScreenWidth-72, gScreenHeight-16);
+  g_Sound_Delete('SOUND_GAME_TELEPORT');
+  g_Sound_Delete('SOUND_GAME_NOTELEPORT');
+  g_Sound_Delete('SOUND_GAME_SECRET');
+  g_Sound_Delete('SOUND_GAME_DOOROPEN');
+  g_Sound_Delete('SOUND_GAME_DOORCLOSE');
+  g_Sound_Delete('SOUND_GAME_BULK1');
+  g_Sound_Delete('SOUND_GAME_BULK2');
+  g_Sound_Delete('SOUND_GAME_BUBBLE1');
+  g_Sound_Delete('SOUND_GAME_BUBBLE2');
+  g_Sound_Delete('SOUND_GAME_BURNING');
+  g_Sound_Delete('SOUND_GAME_SWITCH1');
+  g_Sound_Delete('SOUND_GAME_SWITCH0');

 
 

-  if gGameOn then drawProfilers();
+  goodsnd[0].Free();
+  goodsnd[1].Free();
+  goodsnd[2].Free();
+  goodsnd[3].Free();

 
 

-  g_Holmes_DrawUI();
-end;
+  g_Sound_Delete('SOUND_ANNOUNCER_GOOD1');
+  g_Sound_Delete('SOUND_ANNOUNCER_GOOD2');
+  g_Sound_Delete('SOUND_ANNOUNCER_GOOD3');
+  g_Sound_Delete('SOUND_ANNOUNCER_GOOD4');

 
 

-procedure g_Game_Quit();
-begin
-  g_Game_StopAllSounds(True);
-  gMusic.Free();
-  g_Game_SaveOptions();
-  g_Game_FreeData();
-  g_PlayerModel_FreeData();
-  g_Texture_DeleteAll();
-  g_Frames_DeleteAll();
-  g_Menu_Free();
+  killsnd[0].Free();
+  killsnd[1].Free();
+  killsnd[2].Free();
+  killsnd[3].Free();

 
 

-  if NetInitDone then g_Net_Free;
+  g_Sound_Delete('SOUND_ANNOUNCER_KILL2X');
+  g_Sound_Delete('SOUND_ANNOUNCER_KILL3X');
+  g_Sound_Delete('SOUND_ANNOUNCER_KILL4X');
+  g_Sound_Delete('SOUND_ANNOUNCER_KILLMX');

 
 

-// Íàäî óäàëèòü êàðòó ïîñëå òåñòà:
-  if gMapToDelete <> '' then
-    g_Game_DeleteTestMap();
+  hahasnd[0].Free();
+  hahasnd[1].Free();
+  hahasnd[2].Free();
+
+  g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA1');
+  g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA2');
+  g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA3');
+
+  sound_get_flag[0].Free();
+  sound_get_flag[1].Free();
+  sound_lost_flag[0].Free();
+  sound_lost_flag[1].Free();
+  sound_ret_flag[0].Free();
+  sound_ret_flag[1].Free();
+  sound_cap_flag[0].Free();
+  sound_cap_flag[1].Free();
+
+  g_Sound_Delete('SOUND_CTF_GET1');
+  g_Sound_Delete('SOUND_CTF_GET2');
+  g_Sound_Delete('SOUND_CTF_LOST1');
+  g_Sound_Delete('SOUND_CTF_LOST2');
+  g_Sound_Delete('SOUND_CTF_RETURN1');
+  g_Sound_Delete('SOUND_CTF_RETURN2');
+  g_Sound_Delete('SOUND_CTF_CAPTURE1');
+  g_Sound_Delete('SOUND_CTF_CAPTURE2');
+
+  g_Game_FreeChatSounds();

 
 

-  gExit := EXIT_QUIT;
-  PushExitEvent();
+  DataLoaded := False;

 end;
 
 procedure g_FatalError(Text: String);
 begin
   g_Console_Add(Format(_lc[I_FATAL_ERROR], [Text]), True);
 end;
 
 procedure g_FatalError(Text: String);
 begin
   g_Console_Add(Format(_lc[I_FATAL_ERROR], [Text]), True);

-  e_WriteLog(Format(_lc[I_FATAL_ERROR], [Text]), MSG_WARNING);
+  e_WriteLog(Format(_lc[I_FATAL_ERROR], [Text]), TMsgType.Warning);

 
   gExit := EXIT_SIMPLE;
 
   gExit := EXIT_SIMPLE;

+  if gGameOn then EndGame;

 end;
 
 procedure g_SimpleError(Text: String);
 begin
   g_Console_Add(Format(_lc[I_SIMPLE_ERROR], [Text]), True);
 end;
 
 procedure g_SimpleError(Text: String);
 begin
   g_Console_Add(Format(_lc[I_SIMPLE_ERROR], [Text]), True);

-  e_WriteLog(Format(_lc[I_SIMPLE_ERROR], [Text]), MSG_WARNING);
-end;
-
-procedure g_Game_SetupScreenSize();
-const
-  RES_FACTOR = 4.0 / 3.0;
-var
-  s: Single;
-  rf: Single;
-  bw, bh: Word;
-begin
-// Ðàçìåð ýêðàíîâ èãðîêîâ:
-  gPlayerScreenSize.X := gScreenWidth-196;
-  if (gPlayer1 <> nil) and (gPlayer2 <> nil) then
-    gPlayerScreenSize.Y := gScreenHeight div 2
-  else
-    gPlayerScreenSize.Y := gScreenHeight;
-
-// Ðàçìåð çàäíåãî ïëàíà:
-  if BackID <> DWORD(-1) then
-  begin
-    s := SKY_STRETCH;
-    if (gScreenWidth*s > gMapInfo.Width) or
-       (gScreenHeight*s > gMapInfo.Height) then
-    begin
-      gBackSize.X := gScreenWidth;
-      gBackSize.Y := gScreenHeight;
-    end
-    else
-    begin
-      e_GetTextureSize(BackID, @bw, @bh);
-      rf := Single(bw) / Single(bh);
-      if (rf > RES_FACTOR) then bw := Round(Single(bh) * RES_FACTOR)
-      else if (rf < RES_FACTOR) then bh := Round(Single(bw) / RES_FACTOR);
-      s := Max(gScreenWidth / bw, gScreenHeight / bh);
-      if (s < 1.0) then s := 1.0;
-      gBackSize.X := Round(bw*s);
-      gBackSize.Y := Round(bh*s);
-    end;
-  end;
-end;
-
-procedure g_Game_ChangeResolution(newWidth, newHeight: Word; nowFull, nowMax: Boolean);
-begin
-  g_Window_SetSize(newWidth, newHeight, nowFull);
+  e_WriteLog(Format(_lc[I_SIMPLE_ERROR], [Text]), TMsgType.Warning);

 end;
 
 procedure g_Game_AddPlayer(Team: Byte = TEAM_NONE);
 end;
 
 procedure g_Game_AddPlayer(Team: Byte = TEAM_NONE);


@@ -3429,22 +2565,23 @@ begin
   if ((not gGameOn) and (gState <> STATE_INTERCUSTOM))
   or (not (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT])) then
     Exit;
   if ((not gGameOn) and (gState <> STATE_INTERCUSTOM))
   or (not (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT])) then
     Exit;

+
+  if (gGameSettings.MaxLives > 0) and (gLMSRespawn = LMS_RESPAWN_NONE) then
+    Exit;
+

   if gPlayer1 = nil then
   begin
     if g_Game_IsClient then
     begin
       if NetPlrUID1 > -1 then
   if gPlayer1 = nil then
   begin
     if g_Game_IsClient then
     begin
       if NetPlrUID1 > -1 then

-      begin

         MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
         MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);

-        gPlayer1 := g_Player_Get(NetPlrUID1);
-      end;

       Exit;
     end;
 
     if not (Team in [TEAM_RED, TEAM_BLUE]) then
       Team := gPlayer1Settings.Team;
 
       Exit;
     end;
 
     if not (Team in [TEAM_RED, TEAM_BLUE]) then
       Team := gPlayer1Settings.Team;
 

-    // Ñîçäàíèå ïåðâîãî èãðîêà:
+    // Создание первого игрока:

     gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                              gPlayer1Settings.Color,
                                              Team, False));
     gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                              gPlayer1Settings.Color,
                                              Team, False));


@@ -3457,9 +2594,7 @@ begin
       if g_Game_IsServer and g_Game_IsNet then
         MH_SEND_PlayerCreate(gPlayer1.UID);
       gPlayer1.Respawn(False, True);
       if g_Game_IsServer and g_Game_IsNet then
         MH_SEND_PlayerCreate(gPlayer1.UID);
       gPlayer1.Respawn(False, True);

-
-      if g_Game_IsNet and NetUseMaster then
-        g_Net_Slist_Update;
+      g_Net_Slist_ServerPlayerComes();

     end;
 
     Exit;
     end;
 
     Exit;


@@ -3476,7 +2611,7 @@ begin
     if not (Team in [TEAM_RED, TEAM_BLUE]) then
       Team := gPlayer2Settings.Team;
 
     if not (Team in [TEAM_RED, TEAM_BLUE]) then
       Team := gPlayer2Settings.Team;
 

-    // Ñîçäàíèå âòîðîãî èãðîêà:
+    // Создание второго игрока:

     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
                                              gPlayer2Settings.Color,
                                              Team, False));
     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
                                              gPlayer2Settings.Color,
                                              Team, False));


@@ -3489,9 +2624,7 @@ begin
       if g_Game_IsServer and g_Game_IsNet then
         MH_SEND_PlayerCreate(gPlayer2.UID);
       gPlayer2.Respawn(False, True);
       if g_Game_IsServer and g_Game_IsNet then
         MH_SEND_PlayerCreate(gPlayer2.UID);
       gPlayer2.Respawn(False, True);

-
-      if g_Game_IsNet and NetUseMaster then
-        g_Net_Slist_Update;
+      g_Net_Slist_ServerPlayerComes();

     end;
 
     Exit;
     end;
 
     Exit;


@@ -3514,11 +2647,13 @@ begin
       Pl.Kill(K_SIMPLEKILL, 0, HIT_DISCON);
       g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
       g_Player_Remove(Pl.UID);
       Pl.Kill(K_SIMPLEKILL, 0, HIT_DISCON);
       g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
       g_Player_Remove(Pl.UID);

-
-      if g_Game_IsNet and NetUseMaster then
-        g_Net_Slist_Update;
-    end else
+      g_Net_Slist_ServerPlayerLeaves();
+    end
+    else
+    begin
+      gSpectLatchPID2 := Pl.UID;

       gPlayer2 := nil;
       gPlayer2 := nil;

+    end;

     Exit;
   end;
   Pl := gPlayer1;
     Exit;
   end;
   Pl := gPlayer1;


@@ -3530,16 +2665,16 @@ begin
       Pl.Kill(K_SIMPLEKILL, 0, HIT_DISCON);
       g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
       g_Player_Remove(Pl.UID);
       Pl.Kill(K_SIMPLEKILL, 0, HIT_DISCON);
       g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
       g_Player_Remove(Pl.UID);

-
-      if g_Game_IsNet and NetUseMaster then
-        g_Net_Slist_Update;
+      g_Net_Slist_ServerPlayerLeaves();

     end else
     begin
     end else
     begin

+      gSpectLatchPID1 := Pl.UID;

       gPlayer1 := nil;
       MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
     end;
     Exit;
   end;
       gPlayer1 := nil;
       MC_SEND_CheatRequest(NET_CHEAT_SPECTATE);
     end;
     Exit;
   end;

+  g_Net_Slist_ServerPlayerLeaves();

 end;
 
 procedure g_Game_Spectate();
 end;
 
 procedure g_Game_Spectate();


@@ -3558,14 +2693,15 @@ end;
 procedure g_Game_StartSingle(Map: String; TwoPlayers: Boolean; nPlayers: Byte);
 var
   i, nPl: Integer;
 procedure g_Game_StartSingle(Map: String; TwoPlayers: Boolean; nPlayers: Byte);
 var
   i, nPl: Integer;

+  tmps: AnsiString;

 begin
   g_Game_Free();
 
 begin
   g_Game_Free();
 

-  e_WriteLog('Starting singleplayer game...', MSG_NOTIFY);
+  e_WriteLog('Starting singleplayer game...', TMsgType.Notify);

 
   g_Game_ClearLoading();
 
 
   g_Game_ClearLoading();
 

-// Íàñòðîéêè èãðû:
+// Настройки игры:

   FillByte(gGameSettings, SizeOf(TGameSettings), 0);
   gAimLine := False;
   gShowMap := False;
   FillByte(gGameSettings, SizeOf(TGameSettings), 0);
   gAimLine := False;
   gShowMap := False;


@@ -3574,14 +2710,18 @@ begin
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_ALLOWEXIT;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_MONSTERS;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_BOTVSMONSTER;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_ALLOWEXIT;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_MONSTERS;
   gGameSettings.Options := gGameSettings.Options + GAME_OPTION_BOTVSMONSTER;

+  gGameSettings.Options := gGameSettings.Options + GAME_OPTION_TEAMHITPROJECTILE;
+  gGameSettings.Options := gGameSettings.Options + GAME_OPTION_TEAMHITTRACE;

   gSwitchGameMode := GM_SINGLE;
 
   gSwitchGameMode := GM_SINGLE;
 

-  g_Game_ExecuteEvent('ongamestart');
+  gLMSRespawn := LMS_RESPAWN_NONE;
+  gLMSRespawnTime := 0;
+  gSpectLatchPID1 := 0;
+  gSpectLatchPID2 := 0;

 
 

-// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
-  g_Game_SetupScreenSize();
+  g_Game_ExecuteEvent('ongamestart');

 
 

-// Ñîçäàíèå ïåðâîãî èãðîêà:
+// Создание первого игрока:

   gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                            gPlayer1Settings.Color,
                                            gPlayer1Settings.Team, False));
   gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                            gPlayer1Settings.Color,
                                            gPlayer1Settings.Team, False));


@@ -3594,7 +2734,7 @@ begin
   gPlayer1.Name := gPlayer1Settings.Name;
   nPl := 1;
 
   gPlayer1.Name := gPlayer1Settings.Name;
   nPl := 1;
 

-// Ñîçäàíèå âòîðîãî èãðîêà, åñëè åñòü:
+// Создание второго игрока, если есть:

   if TwoPlayers then
   begin
     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
   if TwoPlayers then
   begin
     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,


@@ -3610,17 +2750,18 @@ begin
     Inc(nPl);
   end;
 
     Inc(nPl);
   end;
 

-// Çàãðóçêà è çàïóñê êàðòû:
-  if not g_Game_StartMap(MAP, True) then
+// Загрузка и запуск карты:
+  if not g_Game_StartMap(false{asMegawad}, MAP, True) then

   begin
   begin

-    g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + MAP]));
+    if (Pos(':\', Map) > 0) or (Pos(':/', Map) > 0) then tmps := Map else tmps := gGameSettings.WAD + ':\' + MAP;
+    g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [tmps]));

     Exit;
   end;
 
     Exit;
   end;
 

-// Íàñòðîéêè èãðîêîâ è áîòîâ:
+// Настройки игроков и ботов:

   g_Player_Init();
 
   g_Player_Init();
 

-// Ñîçäàåì áîòîâ:
+// Создаем ботов:

   for i := nPl+1 to nPlayers do
     g_Player_Create(STD_PLAYER_MODEL, _RGB(0, 0, 0), 0, True);
 end;
   for i := nPl+1 to nPlayers do
     g_Player_Create(STD_PLAYER_MODEL, _RGB(0, 0, 0), 0, True);
 end;


@@ -3634,11 +2775,11 @@ var
 begin
   g_Game_Free();
 
 begin
   g_Game_Free();
 

-  e_WriteLog('Starting custom game...', MSG_NOTIFY);
+  e_WriteLog('Starting custom game...', TMsgType.Notify);

 
   g_Game_ClearLoading();
 
 
   g_Game_ClearLoading();
 

-// Íàñòðîéêè èãðû:
+// Настройки игры:

   gGameSettings.GameType := GT_CUSTOM;
   gGameSettings.GameMode := GameMode;
   gSwitchGameMode := GameMode;
   gGameSettings.GameType := GT_CUSTOM;
   gGameSettings.GameMode := GameMode;
   gSwitchGameMode := GameMode;


@@ -3654,12 +2795,14 @@ begin
   gAimLine := False;
   gShowMap := False;
 
   gAimLine := False;
   gShowMap := False;
 

-  g_Game_ExecuteEvent('ongamestart');
+  gLMSRespawn := LMS_RESPAWN_NONE;
+  gLMSRespawnTime := 0;
+  gSpectLatchPID1 := 0;
+  gSpectLatchPID2 := 0;

 
 

-// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
-  g_Game_SetupScreenSize();
+  g_Game_ExecuteEvent('ongamestart');

 
 

-// Ðåæèì íàáëþäàòåëÿ:
+// Режим наблÑ\8eдаÑ\82елÑ\8f:

   if nPlayers = 0 then
   begin
     gPlayer1 := nil;
   if nPlayers = 0 then
   begin
     gPlayer1 := nil;


@@ -3669,7 +2812,7 @@ begin
   nPl := 0;
   if nPlayers >= 1 then
   begin
   nPl := 0;
   if nPlayers >= 1 then
   begin

-  // Ñîçäàíèå ïåðâîãî èãðîêà:
+  // Создание первого игрока:

     gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                              gPlayer1Settings.Color,
                                              gPlayer1Settings.Team, False));
     gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                              gPlayer1Settings.Color,
                                              gPlayer1Settings.Team, False));


@@ -3685,7 +2828,7 @@ begin
 
   if nPlayers >= 2 then
   begin
 
   if nPlayers >= 2 then
   begin

-  // Ñîçäàíèå âòîðîãî èãðîêà:
+  // Создание второго игрока:

     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
                                              gPlayer2Settings.Color,
                                              gPlayer2Settings.Team, False));
     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
                                              gPlayer2Settings.Color,
                                              gPlayer2Settings.Team, False));


@@ -3699,14 +2842,14 @@ begin
     Inc(nPl);
   end;
 
     Inc(nPl);
   end;
 

-// Çàãðóçêà è çàïóñê êàðòû:
-  if not g_Game_StartMap(Map, True) then
+// Загрузка и запуск карты:
+  if not g_Game_StartMap(true{asMegawad}, Map, True) then

   begin
     g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Map]));
     Exit;
   end;
 
   begin
     g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Map]));
     Exit;
   end;
 

-// Íåò òî÷åê ïîÿâëåíèÿ:
+// Нет точек появления:

   if (g_Map_GetPointCount(RESPAWNPOINT_PLAYER1) +
       g_Map_GetPointCount(RESPAWNPOINT_PLAYER2) +
       g_Map_GetPointCount(RESPAWNPOINT_DM) +
   if (g_Map_GetPointCount(RESPAWNPOINT_PLAYER1) +
       g_Map_GetPointCount(RESPAWNPOINT_PLAYER2) +
       g_Map_GetPointCount(RESPAWNPOINT_DM) +


@@ -3717,10 +2860,10 @@ begin
     Exit;
   end;
 
     Exit;
   end;
 

-// Íàñòðîéêè èãðîêîâ è áîòîâ:
+// Настройки игроков и ботов:

   g_Player_Init();
 
   g_Player_Init();
 

-// Ñîçäàåì áîòîâ:
+// Создаем ботов:

   for i := nPl+1 to nPlayers do
     g_Player_Create(STD_PLAYER_MODEL, _RGB(0, 0, 0), 0, True);
 end;
   for i := nPl+1 to nPlayers do
     g_Player_Create(STD_PLAYER_MODEL, _RGB(0, 0, 0), 0, True);
 end;


@@ -3731,12 +2874,13 @@ procedure g_Game_StartServer(Map: String; GameMode: Byte;
                              IPAddr: LongWord; Port: Word);
 begin
   g_Game_Free();
                              IPAddr: LongWord; Port: Word);
 begin
   g_Game_Free();

+  g_Net_Slist_ServerClosed();

 
 

-  e_WriteLog('Starting net game (server)...', MSG_NOTIFY);
+  e_WriteLog('Starting net game (server)...', TMsgType.Notify);

 
   g_Game_ClearLoading();
 
 
   g_Game_ClearLoading();
 

-// Íàñòðîéêè èãðû:
+// Настройки игры:

   gGameSettings.GameType := GT_SERVER;
   gGameSettings.GameMode := GameMode;
   gSwitchGameMode := GameMode;
   gGameSettings.GameType := GT_SERVER;
   gGameSettings.GameMode := GameMode;
   gSwitchGameMode := GameMode;


@@ -3752,12 +2896,14 @@ begin
   gAimLine := False;
   gShowMap := False;
 
   gAimLine := False;
   gShowMap := False;
 

-  g_Game_ExecuteEvent('ongamestart');
+  gLMSRespawn := LMS_RESPAWN_NONE;
+  gLMSRespawnTime := 0;
+  gSpectLatchPID1 := 0;
+  gSpectLatchPID2 := 0;

 
 

-// Óñòàíîâêà ðàçìåðîâ îêíà èãðîêà
-  g_Game_SetupScreenSize();
+  g_Game_ExecuteEvent('ongamestart');

 
 

-// Ðåæèì íàáëþäàòåëÿ:
+// Режим наблÑ\8eдаÑ\82елÑ\8f:

   if nPlayers = 0 then
   begin
     gPlayer1 := nil;
   if nPlayers = 0 then
   begin
     gPlayer1 := nil;


@@ -3766,7 +2912,7 @@ begin
 
   if nPlayers >= 1 then
   begin
 
   if nPlayers >= 1 then
   begin

-  // Ñîçäàíèå ïåðâîãî èãðîêà:
+  // Создание первого игрока:

     gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                              gPlayer1Settings.Color,
                                              gPlayer1Settings.Team, False));
     gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                              gPlayer1Settings.Color,
                                              gPlayer1Settings.Team, False));


@@ -3781,7 +2927,7 @@ begin
 
   if nPlayers >= 2 then
   begin
 
   if nPlayers >= 2 then
   begin

-  // Ñîçäàíèå âòîðîãî èãðîêà:
+  // Создание второго игрока:

     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
                                              gPlayer2Settings.Color,
                                              gPlayer2Settings.Team, False));
     gPlayer2 := g_Player_Get(g_Player_Create(gPlayer2Settings.Model,
                                              gPlayer2Settings.Color,
                                              gPlayer2Settings.Team, False));


@@ -3794,36 +2940,45 @@ begin
     gPlayer2.Name := gPlayer2Settings.Name;
   end;
 
     gPlayer2.Name := gPlayer2Settings.Name;
   end;
 

-// Ñòàðòóåì ñåðâåð
+  g_Game_SetLoadingText(_lc[I_LOAD_HOST], 0, False);
+  if NetForwardPorts then
+    g_Game_SetLoadingText(_lc[I_LOAD_PORTS], 0, False);
+
+// Стартуем сервер

   if not g_Net_Host(IPAddr, Port, NetMaxClients) then
   begin
   if not g_Net_Host(IPAddr, Port, NetMaxClients) then
   begin

-    g_FatalError(_lc[I_NET_MSG] + _lc[I_NET_ERR_HOST]);
+    g_FatalError(_lc[I_NET_MSG] + Format(_lc[I_NET_ERR_HOST], [Port]));

     Exit;
   end;
 
     Exit;
   end;
 

-  g_Net_Slist_Set(NetSlistIP, NetSlistPort);
+  g_Net_Slist_Set(NetMasterList);
+
+  g_Net_Slist_ServerStarted();

 
 

-// Çàãðóçêà è çàïóñê êàðòû:
-  if not g_Game_StartMap(Map, True) then
+// Загрузка и запуск карты:
+  if not g_Game_StartMap(false{asMegawad}, Map, True) then

   begin
   begin

+    g_Net_Slist_ServerClosed();

     g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Map]));
     Exit;
   end;
 
     g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Map]));
     Exit;
   end;
 

-// Íåò òî÷åê ïîÿâëåíèÿ:
+// Нет точек появления:

   if (g_Map_GetPointCount(RESPAWNPOINT_PLAYER1) +
       g_Map_GetPointCount(RESPAWNPOINT_PLAYER2) +
       g_Map_GetPointCount(RESPAWNPOINT_DM) +
       g_Map_GetPointCount(RESPAWNPOINT_RED)+
       g_Map_GetPointCount(RESPAWNPOINT_BLUE)) < 1 then
   begin
   if (g_Map_GetPointCount(RESPAWNPOINT_PLAYER1) +
       g_Map_GetPointCount(RESPAWNPOINT_PLAYER2) +
       g_Map_GetPointCount(RESPAWNPOINT_DM) +
       g_Map_GetPointCount(RESPAWNPOINT_RED)+
       g_Map_GetPointCount(RESPAWNPOINT_BLUE)) < 1 then
   begin

+    g_Net_Slist_ServerClosed();

     g_FatalError(_lc[I_GAME_ERROR_GET_SPAWN]);
     Exit;
   end;
 
     g_FatalError(_lc[I_GAME_ERROR_GET_SPAWN]);
     Exit;
   end;
 

-// Íàñòðîéêè èãðîêîâ è áîòîâ:
+// Настройки игроков и ботов:

   g_Player_Init();
 
   g_Player_Init();
 

+  g_Net_Slist_ServerMapStarted();

   NetState := NET_STATE_GAME;
 end;
 
   NetState := NET_STATE_GAME;
 end;
 


@@ -3842,12 +2997,12 @@ begin
   g_Game_Free();
 
   State := 0;
   g_Game_Free();
 
   State := 0;

-  e_WriteLog('Starting net game (client)...', MSG_NOTIFY);
-  e_WriteLog('NET: Trying to connect to ' + Addr + ':' + IntToStr(Port) + '...', MSG_NOTIFY);
+  e_WriteLog('Starting net game (client)...', TMsgType.Notify);
+  e_WriteLog('NET: Trying to connect to ' + Addr + ':' + IntToStr(Port) + '...', TMsgType.Notify);

 
   g_Game_ClearLoading();
 
 
   g_Game_ClearLoading();
 

-// Íàñòðîéêè èãðû:
+// Настройки игры:

   gGameSettings.GameType := GT_CLIENT;
 
   gCoopTotalMonstersKilled := 0;
   gGameSettings.GameType := GT_CLIENT;
 
   gCoopTotalMonstersKilled := 0;


@@ -3859,13 +3014,19 @@ begin
 
   g_Game_ExecuteEvent('ongamestart');
 
 
   g_Game_ExecuteEvent('ongamestart');
 

-// Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ:
-  g_Game_SetupScreenSize();
-

   NetState := NET_STATE_AUTH;
 
   g_Game_SetLoadingText(_lc[I_LOAD_CONNECT], 0, False);
   NetState := NET_STATE_AUTH;
 
   g_Game_SetLoadingText(_lc[I_LOAD_CONNECT], 0, False);

-// Ñòàðòóåì êëèåíò
+
+  // create (or update) map/resource databases
+  g_Res_CreateDatabases(true);
+
+  gLMSRespawn := LMS_RESPAWN_NONE;
+  gLMSRespawnTime := 0;
+  gSpectLatchPID1 := 0;
+  gSpectLatchPID2 := 0;
+
+// Стартуем клиент

   if not g_Net_Connect(Addr, Port) then
   begin
     g_FatalError(_lc[I_NET_MSG] + _lc[I_NET_ERR_CONN]);
   if not g_Net_Connect(Addr, Port) then
   begin
     g_FatalError(_lc[I_NET_MSG] + _lc[I_NET_ERR_CONN]);


@@ -3880,14 +3041,27 @@ begin
   OuterLoop := True;
   while OuterLoop do
   begin
   OuterLoop := True;
   while OuterLoop do
   begin

-    while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
+    // fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html
+    // tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure.
+    //        thank you, enet. let's ignore failures altogether then.
+    while (enet_host_service(NetHost, @NetEvent, 50) > 0) do

     begin
       if (NetEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
       begin
     begin
       if (NetEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
       begin

+        if (NetEvent.channelID = NET_CHAN_DOWNLOAD_EX) then
+        begin
+          // ignore all download packets, they're processed by separate code
+          enet_packet_destroy(NetEvent.packet);
+          continue;
+        end;

         Ptr := NetEvent.packet^.data;
         if not InMsg.Init(Ptr, NetEvent.packet^.dataLength, True) then
         Ptr := NetEvent.packet^.data;
         if not InMsg.Init(Ptr, NetEvent.packet^.dataLength, True) then

+        begin
+          enet_packet_destroy(NetEvent.packet);

           continue;
           continue;

+        end;

 
 

+        InMsg.ReadLongWord(); // skip size

         MID := InMsg.ReadByte();
 
         if (MID = NET_MSG_INFO) and (State = 0) then
         MID := InMsg.ReadByte();
 
         if (MID = NET_MSG_INFO) and (State = 0) then


@@ -3908,11 +3082,11 @@ begin
           gGameSettings.Options := InMsg.ReadLongWord();
           T := InMsg.ReadLongWord();
 
           gGameSettings.Options := InMsg.ReadLongWord();
           T := InMsg.ReadLongWord();
 

-          newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash);
-          if newResPath = '' then
+          //newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash);
+          //if newResPath = '' then

           begin
           begin

-            g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
-            newResPath := g_Res_DownloadWAD(WadName);
+            //g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
+            newResPath := g_Res_DownloadMapWAD(ExtractFileName(WadName), gWADHash);

             if newResPath = '' then
             begin
               g_FatalError(_lc[I_NET_ERR_HASH]);
             if newResPath = '' then
             begin
               g_FatalError(_lc[I_NET_ERR_HASH]);


@@ -3920,8 +3094,10 @@ begin
               NetState := NET_STATE_NONE;
               Exit;
             end;
               NetState := NET_STATE_NONE;
               Exit;
             end;

+            e_LogWritefln('using downloaded map wad [%s] for [%s]`', [newResPath, WadName], TMsgType.Notify);

           end;
           end;

-          newResPath := ExtractRelativePath(MapsDir, newResPath);
+          //newResPath := ExtractRelativePath(MapsDir, newResPath);
+

 
           gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                                    gPlayer1Settings.Color,
 
           gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
                                                    gPlayer1Settings.Color,


@@ -3940,7 +3116,7 @@ begin
           gPlayer1.UID := NetPlrUID1;
           gPlayer1.Reset(True);
 
           gPlayer1.UID := NetPlrUID1;
           gPlayer1.Reset(True);
 

-          if not g_Game_StartMap(newResPath + ':\' + Map, True) then
+          if not g_Game_StartMap(false{asMegawad}, newResPath + ':\' + Map, True) then

           begin
             g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WadName + ':\' + Map]));
 
           begin
             g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WadName + ':\' + Map]));
 


@@ -3960,6 +3136,7 @@ begin
           enet_packet_destroy(NetEvent.packet);
       end
       else
           enet_packet_destroy(NetEvent.packet);
       end
       else

+      begin

         if (NetEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
         begin
           State := 0;
         if (NetEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
         begin
           State := 0;


@@ -3969,13 +3146,12 @@ begin
           OuterLoop := False;
           Break;
         end;
           OuterLoop := False;
           Break;
         end;

+      end;

     end;
 
     end;
 

-    ProcessLoading();
+    ProcessLoading(true);

 
 

-    e_PollInput();
-
-    if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) then
+    if g_Net_UserRequestExit() then

     begin
       State := 0;
       break;
     begin
       State := 0;
       break;


@@ -3989,34 +3165,29 @@ begin
     Exit;
   end;
 
     Exit;
   end;
 

-  gLMSRespawn := LMS_RESPAWN_NONE;
-  gLMSRespawnTime := 0;
-

   g_Player_Init();
   NetState := NET_STATE_GAME;
   MC_SEND_FullStateRequest;
   g_Player_Init();
   NetState := NET_STATE_GAME;
   MC_SEND_FullStateRequest;

-  e_WriteLog('NET: Connection successful.', MSG_NOTIFY);
+  e_WriteLog('NET: Connection successful.', TMsgType.Notify);

 end;
 
 end;
 

-procedure g_Game_SaveOptions();
-begin
-  g_Options_Write_Video(GameDir+'/'+CONFIG_FILENAME);
-end;
+var
+  lastAsMegaWad: Boolean = false;

 
 

-procedure g_Game_ChangeMap(MapPath: String);
+procedure g_Game_ChangeMap(const MapPath: String);

 var
   Force: Boolean;
 begin
   g_Game_ClearLoading();
 
   Force := gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF];
 var
   Force: Boolean;
 begin
   g_Game_ClearLoading();
 
   Force := gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF];

-  // Åñëè óðîâåíü çàâåðøèëñÿ ïî òðèããåðó Âûõîä, íå î÷èùàòü èíâåíòàðü
+  // Если уровень завершился по триггеру Выход, не очищать инвентарь

   if gExitByTrigger then
   begin
     Force := False;
     gExitByTrigger := False;
   end;
   if gExitByTrigger then
   begin
     Force := False;
     gExitByTrigger := False;
   end;

-  if not g_Game_StartMap(MapPath, Force) then
+  if not g_Game_StartMap(lastAsMegaWad, MapPath, Force) then

     g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [MapPath]));
 end;
 
     g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [MapPath]));
 end;
 


@@ -4027,19 +3198,21 @@ begin
   if g_Game_IsClient then
     Exit;
   map := g_ExtractFileName(gMapInfo.Map);
   if g_Game_IsClient then
     Exit;
   map := g_ExtractFileName(gMapInfo.Map);

+  e_LogWritefln('g_Game_Restart: map = "%s" gCurrentMapFileName = "%s"', [map, gCurrentMapFileName]);

 
   MessageTime := 0;
   gGameOn := False;
   g_Game_ClearLoading();
 
   MessageTime := 0;
   gGameOn := False;
   g_Game_ClearLoading();

-  g_Game_StartMap(Map, True);
+  g_Game_StartMap(lastAsMegaWad, Map, True, gCurrentMapFileName);

 end;
 
 end;
 

-function g_Game_StartMap(Map: String; Force: Boolean = False): Boolean;
+function g_Game_StartMap (asMegawad: Boolean; Map: String; Force: Boolean = False; const oldMapPath: AnsiString=''): Boolean;

 var
   NewWAD, ResName: String;
   I: Integer;
 var
   NewWAD, ResName: String;
   I: Integer;

+  nws: AnsiString;

 begin
 begin

-  g_Map_Free();
+  g_Map_Free((Map <> gCurrentMapFileName) and (oldMapPath <> gCurrentMapFileName));

   g_Player_RemoveAllCorpses();
 
   if (not g_Game_IsClient) and
   g_Player_RemoveAllCorpses();
 
   if (not g_Game_IsClient) and


@@ -4055,21 +3228,62 @@ begin
 
   g_Player_ResetTeams();
 
 
   g_Player_ResetTeams();
 

-  if Pos(':\', Map) > 0 then
+  lastAsMegaWad := asMegawad;
+  if isWadPath(Map) then

   begin
     NewWAD := g_ExtractWadName(Map);
     ResName := g_ExtractFileName(Map);
     if g_Game_IsServer then
     begin
   begin
     NewWAD := g_ExtractWadName(Map);
     ResName := g_ExtractFileName(Map);
     if g_Game_IsServer then
     begin

-      gWADHash := MD5File(MapsDir + NewWAD);
-      g_Game_LoadWAD(NewWAD);
-    end else
-      // hash recieved in MC_RECV_GameEvent -> NET_EV_MAPSTART
-      g_Game_ClientWAD(NewWAD, gWADHash);
-  end else
+      nws := findDiskWad(NewWAD);
+      //writeln('000: Map=[', Map, ']; nws=[', nws, ']; NewWAD=[', NewWAD, ']');
+      if (asMegawad) then
+      begin
+        if (length(nws) = 0) then nws := e_FindWad(MegawadDirs, NewWAD);
+        if (length(nws) = 0) then nws := e_FindWad(MapDirs, NewWAD);
+      end
+      else
+      begin
+        if (length(nws) = 0) then nws := e_FindWad(MapDirs, NewWAD);
+        if (length(nws) = 0) then nws := e_FindWad(MegawadDirs, NewWAD);
+      end;
+      //if (length(nws) = 0) then nws := e_FindWad(MapDownloadDirs, NewWAD);
+      //writeln('001: Map=[', Map, ']; nws=[', nws, ']; NewWAD=[', NewWAD, ']');
+      //nws := NewWAD;
+      if (length(nws) = 0) then
+      begin
+        ResName := ''; // failed
+      end
+      else
+      begin
+        NewWAD := nws;
+        if (g_Game_IsNet) then gWADHash := MD5File(nws);
+        //writeln('********: nws=', nws, ' : Map=', Map, ' : nw=', NewWAD, ' : resname=', ResName);
+        g_Game_LoadWAD(NewWAD);
+      end;
+    end
+    else
+    begin
+      // hash received in MC_RECV_GameEvent -> NET_EV_MAPSTART
+      NewWAD := g_Game_ClientWAD(NewWAD, gWADHash);
+    end;
+  end
+  else
+  begin
+    NewWAD := gGameSettings.WAD;

     ResName := Map;
     ResName := Map;

+  end;
+
+  gTime := 0;

 
 

-  Result := g_Map_Load(MapsDir + gGameSettings.WAD + ':\' + ResName);
+  //writeln('********: gsw=', gGameSettings.WAD, '; rn=', ResName);
+  result := false;
+  if (ResName <> '') and (NewWAD <> '') then
+  begin
+    //result := g_Map_Load(gGameSettings.WAD + ':\' + ResName);
+    result := g_Map_Load(NewWAD+':\'+ResName);
+    r_Render_LoadTextures;
+  end;

   if Result then
     begin
       g_Player_ResetAll(Force or gLastMap, gGameSettings.GameType = GT_SINGLE);
   if Result then
     begin
       g_Player_ResetAll(Force or gLastMap, gGameSettings.GameType = GT_SINGLE);


@@ -4079,13 +3293,13 @@ begin
       gGameOn := True;
 
       DisableCheats();
       gGameOn := True;
 
       DisableCheats();

-      ResetTimer();
+      wNeedTimeReset := True;

 
       if gGameSettings.GameMode = GM_CTF then
       begin
         g_Map_ResetFlag(FLAG_RED);
         g_Map_ResetFlag(FLAG_BLUE);
 
       if gGameSettings.GameMode = GM_CTF then
       begin
         g_Map_ResetFlag(FLAG_RED);
         g_Map_ResetFlag(FLAG_BLUE);

-        // CTF, à ôëàãîâ íåò:
+        // CTF, а флагов нет:

         if not g_Map_HaveFlagPoints() then
           g_SimpleError(_lc[I_GAME_ERROR_CTF]);
       end;
         if not g_Map_HaveFlagPoints() then
           g_SimpleError(_lc[I_GAME_ERROR_CTF]);
       end;


@@ -4097,13 +3311,13 @@ begin
     end;
 
   gExit := 0;
     end;
 
   gExit := 0;

-  gPause := False;
-  gTime := 0;
+  gPauseMain := false;
+  gPauseHolmes := false;

   NetTimeToUpdate := 1;
   NetTimeToReliable := 0;
   NetTimeToMaster := NetMasterRate;
   NetTimeToUpdate := 1;
   NetTimeToReliable := 0;
   NetTimeToMaster := NetMasterRate;

-  gLMSRespawn := LMS_RESPAWN_NONE;
-  gLMSRespawnTime := 0;
+  gSpectLatchPID1 := 0;
+  gSpectLatchPID2 := 0;

   gMissionFailed := False;
   gNextMap := '';
 
   gMissionFailed := False;
   gNextMap := '';
 


@@ -4121,30 +3335,29 @@ begin
 
   g_Game_SpectateCenterView();
 
 
   g_Game_SpectateCenterView();
 

-  if (gGameSettings.MaxLives > 0) and (gGameSettings.WarmupTime > 0) then
+  if g_Game_IsServer then

   begin
   begin

-    gLMSRespawn := LMS_RESPAWN_WARMUP;
-    gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;
-    gLMSSoftSpawn := True;
-    if NetMode = NET_SERVER then
-      MH_SEND_GameEvent(NET_EV_LMS_WARMUP, (gLMSRespawnTime - gTime) div 1000)
+    if (gGameSettings.MaxLives > 0) and (gGameSettings.WarmupTime > 0) then
+    begin
+      gLMSRespawn := LMS_RESPAWN_WARMUP;
+      gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;
+      gLMSSoftSpawn := True;
+      if g_Game_IsNet then
+        MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);
+    end

     else
     else

-      g_Console_Add(Format(_lc[I_MSG_WARMUP_START], [(gLMSRespawnTime - gTime) div 1000]), True);
+    begin
+      gLMSRespawn := LMS_RESPAWN_NONE;
+      gLMSRespawnTime := 0;
+    end;

   end;
 
   if NetMode = NET_SERVER then
   begin
     MH_SEND_GameEvent(NET_EV_MAPSTART, gGameSettings.GameMode, Map);
 
   end;
 
   if NetMode = NET_SERVER then
   begin
     MH_SEND_GameEvent(NET_EV_MAPSTART, gGameSettings.GameMode, Map);
 

-  // Ìàñòåðñåðâåð
-    if NetUseMaster then
-    begin
-      if (NetMHost = nil) or (NetMPeer = nil) then
-        if not g_Net_Slist_Connect then
-          g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR]);
-
-      g_Net_Slist_Update;
-    end;
+  // Мастерсервер
+    g_Net_Slist_ServerMapStarted();

 
     if NetClients <> nil then
       for I := 0 to High(NetClients) do
 
     if NetClients <> nil then
       for I := 0 to High(NetClients) do


@@ -4173,11 +3386,11 @@ begin
   g_Game_ExecuteEvent('onmapstart');
 end;
 
   g_Game_ExecuteEvent('onmapstart');
 end;
 

-procedure SetFirstLevel();
+procedure SetFirstLevel;

 begin
   gNextMap := '';
 
 begin
   gNextMap := '';
 

-  MapList := g_Map_GetMapsList(MapsDir + gGameSettings.WAD);
+  MapList := g_Map_GetMapsList(gGameSettings.WAD);

   if MapList = nil then
     Exit;
 
   if MapList = nil then
     Exit;
 


@@ -4187,7 +3400,7 @@ begin
   MapList := nil;
 end;
 
   MapList := nil;
 end;
 

-procedure g_Game_ExitLevel(Map: Char16);
+procedure g_Game_ExitLevel(const Map: AnsiString);

 begin
   gNextMap := Map;
 
 begin
   gNextMap := Map;
 


@@ -4196,16 +3409,16 @@ begin
   gCoopTotalMonsters := gCoopTotalMonsters + gTotalMonsters;
   gCoopTotalSecrets := gCoopTotalSecrets + gSecretsCount;
 
   gCoopTotalMonsters := gCoopTotalMonsters + gTotalMonsters;
   gCoopTotalSecrets := gCoopTotalSecrets + gSecretsCount;
 

-// Âûøëè â âûõîä â Îäèíî÷íîé èãðå:
+// Вышли в выход в Одиночной игре:

   if gGameSettings.GameType = GT_SINGLE then
     gExit := EXIT_ENDLEVELSINGLE
   if gGameSettings.GameType = GT_SINGLE then
     gExit := EXIT_ENDLEVELSINGLE

-  else // Âûøëè â âûõîä â Ñâîåé èãðå
+  else // Вышли в выход в Своей игре

   begin
     gExit := EXIT_ENDLEVELCUSTOM;
     if gGameSettings.GameMode = GM_COOP then
       g_Player_RememberAll;
 
   begin
     gExit := EXIT_ENDLEVELCUSTOM;
     if gGameSettings.GameMode = GM_COOP then
       g_Player_RememberAll;
 

-    if not g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + gNextMap) then
+    if not g_Map_Exist(gGameSettings.WAD + ':\' + gNextMap) then

     begin
       gLastMap := True;
       if gGameSettings.GameMode = GM_COOP then
     begin
       gLastMap := True;
       if gGameSettings.GameMode = GM_COOP then


@@ -4214,7 +3427,7 @@ begin
       gStatsPressed := True;
       gNextMap := 'MAP01';
 
       gStatsPressed := True;
       gNextMap := 'MAP01';
 

-      if not g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + gNextMap) then
+      if not g_Map_Exist(gGameSettings.WAD + ':\' + gNextMap) then

         g_Game_NextLevel;
 
       if g_Game_IsNet then
         g_Game_NextLevel;
 
       if g_Game_IsNet then


@@ -4240,19 +3453,36 @@ begin
   gNextMap := Map;
 end;
 
   gNextMap := Map;
 end;
 

-procedure g_Game_ClientWAD(NewWAD: String; WHash: TMD5Digest);
+function g_Game_ClientWAD (NewWAD: String; const WHash: TMD5Digest): AnsiString;

 var
 var

-  gWAD: String;
+  gWAD{, xwad}: String;

 begin
 begin

-  if LowerCase(NewWAD) = LowerCase(gGameSettings.WAD) then
-    Exit;
-  if not g_Game_IsClient then
+  result := NewWAD;
+  if not g_Game_IsClient then Exit;
+  //e_LogWritefln('*** g_Game_ClientWAD: `%s`', [NewWAD]);
+
+  gWAD := g_Res_DownloadMapWAD(ExtractFileName(NewWAD), WHash);
+  if gWAD = '' then
+  begin
+    result := '';
+    g_Game_Free();
+    g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [ExtractFileName(NewWAD)]));

     Exit;
     Exit;

+  end;
+
+  e_LogWritefln('using downloaded client map wad [%s] for [%s]', [gWAD, NewWAD], TMsgType.Notify);
+  NewWAD := gWAD;
+
+  g_Game_LoadWAD(NewWAD);
+  result := NewWAD;
+
+  {
+  if LowerCase(NewWAD) = LowerCase(gGameSettings.WAD) then Exit;

   gWAD := g_Res_SearchSameWAD(MapsDir, ExtractFileName(NewWAD), WHash);
   if gWAD = '' then
   begin
     g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
   gWAD := g_Res_SearchSameWAD(MapsDir, ExtractFileName(NewWAD), WHash);
   if gWAD = '' then
   begin
     g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);

-    gWAD := g_Res_DownloadWAD(ExtractFileName(NewWAD));
+    gWAD := g_Res_DownloadMapWAD(ExtractFileName(NewWAD), WHash);

     if gWAD = '' then
     begin
       g_Game_Free();
     if gWAD = '' then
     begin
       g_Game_Free();


@@ -4262,18 +3492,12 @@ begin
   end;
   NewWAD := ExtractRelativePath(MapsDir, gWAD);
   g_Game_LoadWAD(NewWAD);
   end;
   NewWAD := ExtractRelativePath(MapsDir, gWAD);
   g_Game_LoadWAD(NewWAD);

+  }

 end;
 
 procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
 var
   i, n, nb, nr: Integer;
 end;
 
 procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
 var
   i, n, nb, nr: Integer;

-
-  function monRespawn (mon: TMonster): Boolean;
-  begin
-    result := false; // don't stop
-    if not mon.FNoRespawn then mon.Respawn();
-  end;
-

 begin
   if not g_Game_IsServer then Exit;
   if gLMSRespawn = LMS_RESPAWN_NONE then Exit;
 begin
   if not g_Game_IsServer then Exit;
   if gLMSRespawn = LMS_RESPAWN_NONE then Exit;


@@ -4299,12 +3523,14 @@ begin
         else if gPlayers[i].Team = TEAM_BLUE then Inc(nb)
       end;
 
         else if gPlayers[i].Team = TEAM_BLUE then Inc(nb)
       end;
 

-  if (n < 2) or ((gGameSettings.GameMode = GM_TDM) and ((nr = 0) or (nb = 0))) then
+  if (n < 1) or ((gGameSettings.GameMode = GM_TDM) and ((nr = 0) or (nb = 0))) then

   begin
     // wait a second until the fuckers finally decide to join
     gLMSRespawn := LMS_RESPAWN_WARMUP;
   begin
     // wait a second until the fuckers finally decide to join
     gLMSRespawn := LMS_RESPAWN_WARMUP;

-    gLMSRespawnTime := gTime + 1000;
+    gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;

     gLMSSoftSpawn := NoMapRestart;
     gLMSSoftSpawn := NoMapRestart;

+    if g_Game_IsNet then
+      MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);

     Exit;
   end;
 
     Exit;
   end;
 


@@ -4334,17 +3560,14 @@ begin
       gPlayers[i].Frags := 0;
       gPlayers[i].RecallState;
     end;
       gPlayers[i].Frags := 0;
       gPlayers[i].RecallState;
     end;

-    if (gPlayer1 = nil) and (gLMSPID1 > 0) then
-      gPlayer1 := g_Player_Get(gLMSPID1);
-    if (gPlayer2 = nil) and (gLMSPID2 > 0) then
-      gPlayer2 := g_Player_Get(gLMSPID2);
+    if (gPlayer1 = nil) and (gSpectLatchPID1 > 0) then
+      gPlayer1 := g_Player_Get(gSpectLatchPID1);
+    if (gPlayer2 = nil) and (gSpectLatchPID2 > 0) then
+      gPlayer2 := g_Player_Get(gSpectLatchPID2);

   end;
 
   g_Items_RestartRound();
 
   end;
 
   g_Items_RestartRound();
 

-
-  g_Mons_ForEach(monRespawn);
-

   gLMSSoftSpawn := False;
 end;
 
   gLMSSoftSpawn := False;
 end;
 


@@ -4372,7 +3595,7 @@ var
 begin
   Result := '';
 
 begin
   Result := '';
 

-  MapList := g_Map_GetMapsList(MapsDir + gGameSettings.WAD);
+  MapList := g_Map_GetMapsList(gGameSettings.WAD);

   if MapList = nil then
     Exit;
 
   if MapList = nil then
     Exit;
 


@@ -4394,7 +3617,7 @@ begin
     else
       Result := MapList[MapIndex + 1];
 
     else
       Result := MapList[MapIndex + 1];
 

-    if not g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + Result) then Result := Map;
+    if not g_Map_Exist(gGameSettings.WAD + ':\' + Result) then Result := Map;

   end;
 
   MapList := nil;
   end;
 
   MapList := nil;


@@ -4422,27 +3645,27 @@ end;
 procedure g_Game_DeleteTestMap();
 var
   a: Integer;
 procedure g_Game_DeleteTestMap();
 var
   a: Integer;

-  MapName: Char16;
+  //MapName: AnsiString;

   WadName: string;
 {
   WAD: TWADFile;
   WadName: string;
 {
   WAD: TWADFile;

-  MapList: SArray;
+  MapList: SSArray;

   time: Integer;
 }
 begin
   time: Integer;
 }
 begin

-  a := Pos('.wad:\', gMapToDelete);
-  if a = 0 then
-    Exit;
+  a := Pos('.wad:\', toLowerCase1251(gMapToDelete));
+  if (a = 0) then a := Pos('.wad:/', toLowerCase1251(gMapToDelete));
+  if (a = 0) then exit;

 
 

-// Âûäåëÿåì èìÿ wad-ôàéëà è èìÿ êàðòû:
-  WadName := Copy(gMapToDelete, 1, a + 3);
-  Delete(gMapToDelete, 1, a + 5);
+  // Выделяем имя wad-файла и имя карты
+  WadName := Copy(gMapToDelete, 1, a+3);
+  Delete(gMapToDelete, 1, a+5);

   gMapToDelete := UpperCase(gMapToDelete);
   gMapToDelete := UpperCase(gMapToDelete);

-  MapName := '';
-  CopyMemory(@MapName[0], @gMapToDelete[1], Min(16, Length(gMapToDelete)));
+  //MapName := '';
+  //CopyMemory(@MapName[0], @gMapToDelete[1], Min(16, Length(gMapToDelete)));

 
 {
 
 {

-// Èìÿ êàðòû íå ñòàíäàðòíîå òåñòîâîå:
+// Имя карты не стандартное тестовое:

   if MapName <> TEST_MAP_NAME then
     Exit;
 
   if MapName <> TEST_MAP_NAME then
     Exit;
 


@@ -4451,14 +3674,14 @@ begin
     time := g_GetFileTime(WadName);
     WAD := TWADFile.Create();
 
     time := g_GetFileTime(WadName);
     WAD := TWADFile.Create();
 

-  // ×èòàåì Wad-ôàéë:
+  // Читаем Wad-файл:

     if not WAD.ReadFile(WadName) then
     if not WAD.ReadFile(WadName) then

-    begin // Íåò òàêîãî WAD-ôàéëà
+    begin // Нет такого WAD-файла

       WAD.Free();
       Exit;
     end;
 
       WAD.Free();
       Exit;
     end;
 

-  // Ñîñòàâëÿåì ñïèñîê êàðò è èùåì íóæíóþ:
+  // Составляем список карт и ищем нужную:

     WAD.CreateImage();
     MapList := WAD.GetResourcesList('');
 
     WAD.CreateImage();
     MapList := WAD.GetResourcesList('');
 


@@ -4466,7 +3689,7 @@ begin
       for a := 0 to High(MapList) do
         if MapList[a] = MapName then
         begin
       for a := 0 to High(MapList) do
         if MapList[a] = MapName then
         begin

-        // Óäàëÿåì è ñîõðàíÿåì:
+        // Удаляем и сохраняем:

           WAD.RemoveResource('', MapName);
           WAD.SaveTo(WadName);
           Break;
           WAD.RemoveResource('', MapName);
           WAD.SaveTo(WadName);
           Break;


@@ -4479,81 +3702,66 @@ begin
   if gTempDelete then DeleteFile(WadName);
 end;
 
   if gTempDelete then DeleteFile(WadName);
 end;
 

-procedure GameCVars(P: SArray);
+procedure GameCVars(P: SSArray);

 var
   a, b: Integer;
   stat: TPlayerStatArray;
 var
   a, b: Integer;
   stat: TPlayerStatArray;

-  cmd, s: string;
-  config: TConfig;
-begin
-  stat := nil;
-  cmd := LowerCase(P[0]);
-  if cmd = 'r_showfps' then
-  begin
-    if (Length(P) > 1) and
-       ((P[1] = '1') or (P[1] = '0')) then
-      gShowFPS := (P[1][1] = '1');
+  cmd: string;

 
 

-    if gShowFPS then
-      g_Console_Add(_lc[I_MSG_SHOW_FPS_ON])
-    else
-      g_Console_Add(_lc[I_MSG_SHOW_FPS_OFF]);
-  end
-  else if (cmd = 'g_friendlyfire') and not g_Game_IsClient then
+  procedure ParseGameFlag(Flag: LongWord; OffMsg, OnMsg: TStrings_Locale; OnMapChange: Boolean = False);
+  var
+    x: Boolean;

   begin
   begin

-    with gGameSettings do
+    if Length(P) > 1 then

     begin
     begin

-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-      begin
-        if (P[1][1] = '1') then
-          Options := Options or GAME_OPTION_TEAMDAMAGE
-        else
-          Options := Options and (not GAME_OPTION_TEAMDAMAGE);
-      end;
+      x := P[1] = '1';

 
 

-      if (LongBool(Options and GAME_OPTION_TEAMDAMAGE)) then
-        g_Console_Add(_lc[I_MSG_FRIENDLY_FIRE_ON])
+      if x then
+        gsGameFlags := gsGameFlags or Flag

       else
       else

-        g_Console_Add(_lc[I_MSG_FRIENDLY_FIRE_OFF]);
+        gsGameFlags := gsGameFlags and (not Flag);

 
 

-      if g_Game_IsNet then MH_SEND_GameSettings;
-    end;
-  end
-  else if (cmd = 'g_weaponstay') and not g_Game_IsClient then
-  begin
-    with gGameSettings do
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
+      if g_Game_IsServer then

       begin
       begin

-        if (P[1][1] = '1') then
-          Options := Options or GAME_OPTION_WEAPONSTAY
+        if x then
+          gGameSettings.Options := gGameSettings.Options or Flag

         else
         else

-          Options := Options and (not GAME_OPTION_WEAPONSTAY);
+          gGameSettings.Options := gGameSettings.Options and (not Flag);
+        if g_Game_IsNet then MH_SEND_GameSettings;

       end;
       end;

+    end;

 
 

-      if (LongBool(Options and GAME_OPTION_WEAPONSTAY)) then
-        g_Console_Add(_lc[I_MSG_WEAPONSTAY_ON])
-      else
-        g_Console_Add(_lc[I_MSG_WEAPONSTAY_OFF]);
+    if LongBool(gsGameFlags and Flag) then
+      g_Console_Add(_lc[OnMsg])
+    else
+      g_Console_Add(_lc[OffMsg]);

 
 

-      if g_Game_IsNet then MH_SEND_GameSettings;
-    end;
-  end
-  else if cmd = 'g_gamemode' then
+    if OnMapChange and g_Game_IsServer then
+      g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
+  end;
+
+begin
+  stat := nil;
+  cmd := LowerCase(P[0]);
+
+  if cmd = 'g_gamemode' then

   begin
   begin

-    a := g_Game_TextToMode(P[1]);
-    if a = GM_SINGLE then a := GM_COOP;
-    if (Length(P) > 1) and (a <> GM_NONE) and (not g_Game_IsClient) then
+    if (Length(P) > 1) then

     begin
     begin

-      gSwitchGameMode := a;
-      if (gGameOn and (gGameSettings.GameMode = GM_SINGLE)) or
-         (gState = STATE_INTERSINGLE) then
-        gSwitchGameMode := GM_SINGLE;
-      if not gGameOn then
-        gGameSettings.GameMode := gSwitchGameMode;
+      a := g_Game_TextToMode(P[1]);
+      if a = GM_SINGLE then a := GM_COOP;
+      gsGameMode := g_Game_ModeToText(a);
+      if g_Game_IsServer then
+      begin
+        gSwitchGameMode := a;
+        if (gGameOn and (gGameSettings.GameMode = GM_SINGLE)) or
+           (gState = STATE_INTERSINGLE) then
+          gSwitchGameMode := GM_SINGLE;
+        if not gGameOn then
+          gGameSettings.GameMode := gSwitchGameMode;
+      end;

     end;
     end;

+

     if gSwitchGameMode = gGameSettings.GameMode then
       g_Console_Add(Format(_lc[I_MSG_GAMEMODE_CURRENT],
                           [g_Game_ModeToText(gGameSettings.GameMode)]))
     if gSwitchGameMode = gGameSettings.GameMode then
       g_Console_Add(Format(_lc[I_MSG_GAMEMODE_CURRENT],
                           [g_Game_ModeToText(gGameSettings.GameMode)]))


@@ -4562,475 +3770,410 @@ begin
                           [g_Game_ModeToText(gGameSettings.GameMode),
                            g_Game_ModeToText(gSwitchGameMode)]));
   end
                           [g_Game_ModeToText(gGameSettings.GameMode),
                            g_Game_ModeToText(gSwitchGameMode)]));
   end

-  else if (cmd = 'g_allow_exit') and not g_Game_IsClient then
+  else if cmd = 'g_friendlyfire' then

   begin
   begin

-    with gGameSettings do
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-      begin
-        if (P[1][1] = '1') then
-          Options := Options or GAME_OPTION_ALLOWEXIT
-        else
-          Options := Options and (not GAME_OPTION_ALLOWEXIT);
-      end;
-
-      if (LongBool(Options and GAME_OPTION_ALLOWEXIT)) then
-        g_Console_Add(_lc[I_MSG_ALLOWEXIT_ON])
-      else
-        g_Console_Add(_lc[I_MSG_ALLOWEXIT_OFF]);
-      g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
-
-      if g_Game_IsNet then MH_SEND_GameSettings;
-    end;
+    ParseGameFlag(GAME_OPTION_TEAMDAMAGE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON);
+  end
+  else if cmd = 'g_friendly_absorb_damage' then
+  begin
+    ParseGameFlag(GAME_OPTION_TEAMABSORBDAMAGE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON);
+  end
+  else if cmd = 'g_friendly_hit_trace' then
+  begin
+    ParseGameFlag(GAME_OPTION_TEAMHITTRACE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON);
+  end
+  else if cmd = 'g_friendly_hit_projectile' then
+  begin
+    ParseGameFlag(GAME_OPTION_TEAMHITPROJECTILE, I_MSG_FRIENDLY_FIRE_OFF, I_MSG_FRIENDLY_FIRE_ON);
+  end
+  else if cmd = 'g_weaponstay' then
+  begin
+    ParseGameFlag(GAME_OPTION_WEAPONSTAY, I_MSG_WEAPONSTAY_OFF, I_MSG_WEAPONSTAY_ON);
+  end
+  else if cmd = 'g_allow_exit' then
+  begin
+    ParseGameFlag(GAME_OPTION_ALLOWEXIT, I_MSG_ALLOWEXIT_OFF, I_MSG_ALLOWEXIT_ON, True);
+  end
+  else if cmd = 'g_allow_monsters' then
+  begin
+    ParseGameFlag(GAME_OPTION_MONSTERS, I_MSG_ALLOWMON_OFF, I_MSG_ALLOWMON_ON, True);
+  end
+  else if cmd = 'g_bot_vsplayers' then
+  begin
+    ParseGameFlag(GAME_OPTION_BOTVSPLAYER, I_MSG_BOTSVSPLAYERS_OFF, I_MSG_BOTSVSPLAYERS_ON);
+  end
+  else if cmd = 'g_bot_vsmonsters' then
+  begin
+    ParseGameFlag(GAME_OPTION_BOTVSMONSTER, I_MSG_BOTSVSMONSTERS_OFF, I_MSG_BOTSVSMONSTERS_ON);
+  end
+  else if cmd = 'g_dm_keys' then
+  begin
+    ParseGameFlag(GAME_OPTION_DMKEYS, I_MSG_DMKEYS_OFF, I_MSG_DMKEYS_ON, True);

   end
   end

-  else if (cmd = 'g_allow_monsters') and not g_Game_IsClient then
+  else if cmd = 'g_gameflags' then

   begin
   begin

-    with gGameSettings do
+    if Length(P) > 1 then

     begin
     begin

-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
+      gsGameFlags := StrToDWordDef(P[1], gsGameFlags);
+      if g_Game_IsServer then

       begin
       begin

-        if (P[1][1] = '1') then
-          Options := Options or GAME_OPTION_MONSTERS
-        else
-          Options := Options and (not GAME_OPTION_MONSTERS);
+        gGameSettings.Options := gsGameFlags;
+        if g_Game_IsNet then MH_SEND_GameSettings;

       end;
       end;

-
-      if (LongBool(Options and GAME_OPTION_MONSTERS)) then
-        g_Console_Add(_lc[I_MSG_ALLOWMON_ON])
-      else
-        g_Console_Add(_lc[I_MSG_ALLOWMON_OFF]);
-      g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
-
-      if g_Game_IsNet then MH_SEND_GameSettings;

     end;
     end;

+
+    g_Console_Add(Format('%s %u', [cmd, gsGameFlags]));

   end
   end

-  else if (cmd = 'g_bot_vsplayers') and not g_Game_IsClient then
+  else if cmd = 'g_warmup_time' then

   begin
   begin

-    with gGameSettings do
+    if Length(P) > 1 then

     begin
     begin

-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
+      gsWarmupTime := nclamp(StrToIntDef(P[1], gsWarmupTime), 0, $FFFF);
+      if g_Game_IsServer then

       begin
       begin

-        if (P[1][1] = '1') then
-          Options := Options or GAME_OPTION_BOTVSPLAYER
-        else
-          Options := Options and (not GAME_OPTION_BOTVSPLAYER);
+        gGameSettings.WarmupTime := gsWarmupTime;
+        // extend warmup if it's already going
+        if gLMSRespawn = LMS_RESPAWN_WARMUP then
+        begin
+          gLMSRespawnTime := gTime + gsWarmupTime * 1000;
+          if g_Game_IsNet then MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);
+        end;
+        if g_Game_IsNet then MH_SEND_GameSettings;

       end;
       end;

-
-      if (LongBool(Options and GAME_OPTION_BOTVSPLAYER)) then
-        g_Console_Add(_lc[I_MSG_BOTSVSPLAYERS_ON])
-      else
-        g_Console_Add(_lc[I_MSG_BOTSVSPLAYERS_OFF]);
-
-      if g_Game_IsNet then MH_SEND_GameSettings;

     end;
     end;

+
+    g_Console_Add(Format(_lc[I_MSG_WARMUP], [Integer(gsWarmupTime)]));
+    if g_Game_IsServer then g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);

   end
   end

-  else if (cmd = 'g_bot_vsmonsters') and not g_Game_IsClient then
+  else if cmd = 'g_spawn_invul' then

   begin
   begin

-    with gGameSettings do
+    if Length(P) > 1 then

     begin
     begin

-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
+      gsSpawnInvul := nclamp(StrToIntDef(P[1], gsSpawnInvul), 0, $FFFF);
+      if g_Game_IsServer then

       begin
       begin

-        if (P[1][1] = '1') then
-          Options := Options or GAME_OPTION_BOTVSMONSTER
-        else
-          Options := Options and (not GAME_OPTION_BOTVSMONSTER);
+        gGameSettings.SpawnInvul := gsSpawnInvul;
+        if g_Game_IsNet then MH_SEND_GameSettings;

       end;
       end;

-
-      if (LongBool(Options and GAME_OPTION_BOTVSMONSTER)) then
-        g_Console_Add(_lc[I_MSG_BOTSVSMONSTERS_ON])
-      else
-        g_Console_Add(_lc[I_MSG_BOTSVSMONSTERS_OFF]);
-
-      if g_Game_IsNet then MH_SEND_GameSettings;

     end;
     end;

+
+    g_Console_Add(Format('%s %d', [cmd, Integer(gsSpawnInvul)]));

   end
   end

-  else if (cmd = 'g_warmuptime') and not g_Game_IsClient then
+  else if cmd = 'g_item_respawn_time' then

   begin
     if Length(P) > 1 then
     begin
   begin
     if Length(P) > 1 then
     begin

-      if StrToIntDef(P[1], gGameSettings.WarmupTime) = 0 then
-        gGameSettings.WarmupTime := 30
-      else
-        gGameSettings.WarmupTime := StrToIntDef(P[1], gGameSettings.WarmupTime);
+      gsItemRespawnTime := nclamp(StrToIntDef(P[1], gsItemRespawnTime), 0, $FFFF);
+      if g_Game_IsServer then
+      begin
+        gGameSettings.ItemRespawnTime := gsItemRespawnTime;
+        if g_Game_IsNet then MH_SEND_GameSettings;
+      end;

     end;
 
     end;
 

-    g_Console_Add(Format(_lc[I_MSG_WARMUP],
-                 [gGameSettings.WarmupTime]));
-    g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
+    g_Console_Add(Format('%s %d', [cmd, Integer(gsItemRespawnTime)]));
+    if g_Game_IsServer then g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);

   end
   end

-  else if cmd = 'net_interp' then
+  else if cmd = 'sv_intertime' then

   begin
     if (Length(P) > 1) then
   begin
     if (Length(P) > 1) then

-      NetInterpLevel := StrToIntDef(P[1], NetInterpLevel);
+      gDefInterTime := Min(Max(StrToIntDef(P[1], gDefInterTime), -1), 120);

 
 

-    g_Console_Add('net_interp = ' + IntToStr(NetInterpLevel));
-    config := TConfig.CreateFile(GameDir+'/'+CONFIG_FILENAME);
-    config.WriteInt('Client', 'InterpolationSteps', NetInterpLevel);
-    config.SaveFile(GameDir+'/'+CONFIG_FILENAME);
-    config.Free();
+    g_Console_Add(cmd + ' = ' + IntToStr(gDefInterTime));

   end
   end

-  else if cmd = 'net_forceplayerupdate' then
+  else if cmd = 'g_max_particles' then

   begin
   begin

-    if (Length(P) > 1) and
-       ((P[1] = '1') or (P[1] = '0')) then
-      NetForcePlayerUpdate := (P[1][1] = '1');
-
-    if NetForcePlayerUpdate then
-      g_Console_Add('net_forceplayerupdate = 1')
+    if Length(p) = 2 then
+    begin
+      a := Max(0, StrToInt(p[1]));
+      g_GFX_SetMax(a)
+    end
+    else if Length(p) = 1 then
+    begin
+      e_LogWritefln('%s', [g_GFX_GetMax()])
+    end

     else
     else

-      g_Console_Add('net_forceplayerupdate = 0');
-    config := TConfig.CreateFile(GameDir+'/'+CONFIG_FILENAME);
-    config.WriteBool('Client', 'ForcePlayerUpdate', NetForcePlayerUpdate);
-    config.SaveFile(GameDir+'/'+CONFIG_FILENAME);
-    config.Free();
+    begin
+      e_LogWritefln('usage: %s <n>', [cmd])
+    end

   end
   end

-  else if cmd = 'net_predictself' then
+  else if cmd = 'g_max_shells' then

   begin
   begin

-    if (Length(P) > 1) and
-       ((P[1] = '1') or (P[1] = '0')) then
-      NetPredictSelf := (P[1][1] = '1');
-
-    if NetPredictSelf then
-      g_Console_Add('net_predictself = 1')
+    if Length(p) = 2 then
+    begin
+      a := Max(0, StrToInt(p[1]));
+      g_Shells_SetMax(a)
+    end
+    else if Length(p) = 1 then
+    begin
+      e_LogWritefln('%s', [g_Shells_GetMax()])
+    end

     else
     else

-      g_Console_Add('net_predictself = 0');
-    config := TConfig.CreateFile(GameDir+'/'+CONFIG_FILENAME);
-    config.WriteBool('Client', 'PredictSelf', NetPredictSelf);
-    config.SaveFile(GameDir+'/'+CONFIG_FILENAME);
-    config.Free();
+    begin
+      e_LogWritefln('usage: %s <n>', [cmd])
+    end

   end
   end

-  else if cmd = 'sv_name' then
+  else if cmd = 'g_max_gibs' then

   begin
   begin

-    if (Length(P) > 1) and (Length(P[1]) > 0) then
+    if Length(p) = 2 then

     begin
     begin

-      NetServerName := P[1];
-      if Length(NetServerName) > 64 then
-        SetLength(NetServerName, 64);
-      if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
-        g_Net_Slist_Update;
-    end;
-
-    g_Console_Add(cmd + ' = "' + NetServerName + '"');
+      a := Max(0, StrToInt(p[1]));
+      g_Gibs_SetMax(a)
+    end
+    else if Length(p) = 1 then
+    begin
+      e_LogWritefln('%s', [g_Gibs_GetMax()])
+    end
+    else
+    begin
+      e_LogWritefln('usage: %s <n>', [cmd])
+    end

   end
   end

-  else if cmd = 'sv_passwd' then
+  else if cmd = 'g_max_corpses' then

   begin
   begin

-    if (Length(P) > 1) and (Length(P[1]) > 0) then
+    if Length(p) = 2 then

     begin
     begin

-      NetPassword := P[1];
-      if Length(NetPassword) > 24 then
-        SetLength(NetPassword, 24);
-      if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
-        g_Net_Slist_Update;
-    end;
-
-    g_Console_Add(cmd + ' = "' + AnsiLowerCase(NetPassword) + '"');
+      a := Max(0, StrToInt(p[1]));
+      g_Corpses_SetMax(a)
+    end
+    else if Length(p) = 1 then
+    begin
+      e_LogWritefln('%s', [g_Corpses_GetMax()])
+    end
+    else
+    begin
+      e_LogWritefln('usage: %s <n>', [cmd])
+    end

   end
   end

-  else if cmd = 'sv_maxplrs' then
+  else if cmd = 'g_scorelimit' then

   begin
   begin

-    if (Length(P) > 1) then
+    if Length(P) > 1 then

     begin
     begin

-      NetMaxClients := Min(Max(StrToIntDef(P[1], NetMaxClients), 1), NET_MAXCLIENTS);
-      if g_Game_IsServer and g_Game_IsNet then
+      gsGoalLimit := nclamp(StrToIntDef(P[1], gsGoalLimit), 0, $FFFF);
+
+      if g_Game_IsServer then

       begin
         b := 0;
       begin
         b := 0;

-        for a := 0 to High(NetClients) do
-          if NetClients[a].Used then
-          begin
-            Inc(b);
-            if b > NetMaxClients then
-            begin
-              s := g_Player_Get(NetClients[a].Player).Name;
-              enet_peer_disconnect(NetClients[a].Peer, NET_DISC_FULL);
-              g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
-              MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
-            end;
-          end;
-        if NetUseMaster then
-          g_Net_Slist_Update;
+        if gGameSettings.GameMode = GM_DM then
+        begin // DM
+          stat := g_Player_GetStats();
+          if stat <> nil then
+            for a := 0 to High(stat) do
+              if stat[a].Frags > b then
+                b := stat[a].Frags;
+        end
+        else // TDM/CTF
+          b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
+
+        // if someone has a higher score, set it to that instead
+        gsGoalLimit := max(gsGoalLimit, b);
+        gGameSettings.GoalLimit := gsGoalLimit;
+ 
+        if g_Game_IsNet then MH_SEND_GameSettings;

       end;
     end;
 
       end;
     end;
 

-    g_Console_Add(cmd + ' = ' + IntToStr(NetMaxClients));
+    g_Console_Add(Format(_lc[I_MSG_SCORE_LIMIT], [Integer(gsGoalLimit)]));

   end
   end

-  else if cmd = 'sv_public' then
+  else if cmd = 'g_timelimit' then

   begin
   begin

-    if (Length(P) > 1) then
+    if Length(P) > 1 then

     begin
     begin

-      NetUseMaster := StrToIntDef(P[1], Byte(NetUseMaster)) > 0;
-      if g_Game_IsServer and g_Game_IsNet then
-        if NetUseMaster then
-        begin
-          if NetMPeer = nil then
-            if not g_Net_Slist_Connect() then
-              g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR]);
-          g_Net_Slist_Update();
-        end
-        else
-          if NetMPeer <> nil then
-            g_Net_Slist_Disconnect();
+      gsTimeLimit := nclamp(StrToIntDef(P[1], gsTimeLimit), 0, $FFFF);
+      if g_Game_IsServer then
+      begin
+        gGameSettings.TimeLimit := gsTimeLimit;
+        if g_Game_IsNet then MH_SEND_GameSettings;
+      end;

     end;
     end;

-
-    g_Console_Add(cmd + ' = ' + IntToStr(Byte(NetUseMaster)));
+    g_Console_Add(Format(_lc[I_MSG_TIME_LIMIT],
+                         [gsTimeLimit div 3600,
+                         (gsTimeLimit div 60) mod 60,
+                          gsTimeLimit mod 60]));

   end
   end

-  else if cmd = 'sv_intertime' then
+  else if cmd = 'g_maxlives' then

   begin
   begin

-    if (Length(P) > 1) then
-      gDefInterTime := Min(Max(StrToIntDef(P[1], gDefInterTime), -1), 120);
+    if Length(P) > 1 then
+    begin
+      gsMaxLives := nclamp(StrToIntDef(P[1], gsMaxLives), 0, $FFFF);
+      if g_Game_IsServer then
+      begin
+        gGameSettings.MaxLives := gsMaxLives;
+        if g_Game_IsNet then MH_SEND_GameSettings;
+      end;
+    end;

 
 

-    g_Console_Add(cmd + ' = ' + IntToStr(gDefInterTime));
-  end
-  else if cmd = 'p1_name' then
+    g_Console_Add(Format(_lc[I_MSG_LIVES], [Integer(gsMaxLives)]));
+  end;
+end;
+
+procedure PlayerSettingsCVars(P: SSArray);
+var
+  cmd: string;
+  team: Byte;
+
+  function ParseTeam(s: string): Byte;

   begin
   begin

-    if (Length(P) > 1) and gGameOn then
-    begin
-      if g_Game_IsClient then
+    result := 0;
+    case s of
+      'red', '1':  result := TEAM_RED;
+      'blue', '2': result := TEAM_BLUE;
+      else         result := TEAM_NONE;
+    end;
+  end;
+begin
+  cmd := LowerCase(P[0]);
+  case cmd of
+    'p1_name':

       begin
       begin

-        gPlayer1Settings.Name := b_Text_Unformat(P[1]);
-        MC_SEND_PlayerSettings;
-      end
-      else
-        if gPlayer1 <> nil then
+        if (Length(P) > 1) then

         begin
         begin

-          gPlayer1.Name := b_Text_Unformat(P[1]);
-          if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
-        end
-        else

           gPlayer1Settings.Name := b_Text_Unformat(P[1]);
           gPlayer1Settings.Name := b_Text_Unformat(P[1]);

-    end;
-  end
-  else if cmd = 'p2_name' then
-  begin
-    if (Length(P) > 1) and gGameOn then
-    begin
-      if g_Game_IsClient then
+          if g_Game_IsClient then
+            MC_SEND_PlayerSettings
+          else if gGameOn and (gPlayer1 <> nil) then
+          begin
+            gPlayer1.Name := b_Text_Unformat(P[1]);
+            if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
+          end;
+        end;
+      end;
+    'p2_name':

       begin
       begin

-        gPlayer2Settings.Name := b_Text_Unformat(P[1]);
-        MC_SEND_PlayerSettings;
-      end
-      else
-        if gPlayer2 <> nil then
+        if (Length(P) > 1) then

         begin
         begin

-          gPlayer2.Name := b_Text_Unformat(P[1]);
-          if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
-        end
-        else

           gPlayer2Settings.Name := b_Text_Unformat(P[1]);
           gPlayer2Settings.Name := b_Text_Unformat(P[1]);

-    end;
-  end
-  else if cmd = 'p1_color' then
-  begin
-    if Length(P) > 3 then
-      if g_Game_IsClient then
+          if g_Game_IsClient then
+            MC_SEND_PlayerSettings
+          else if gGameOn and (gPlayer2 <> nil) then
+          begin
+            gPlayer2.Name := b_Text_Unformat(P[1]);
+            if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
+          end;
+        end;
+      end;
+    'p1_color':

       begin
       begin

-        gPlayer1Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
-                                       EnsureRange(StrToIntDef(P[2], 0), 0, 255),
-                                       EnsureRange(StrToIntDef(P[3], 0), 0, 255));
-        MC_SEND_PlayerSettings;
-      end
-      else
-        if gPlayer1 <> nil then
+        if Length(P) > 3 then

         begin
         begin

-          gPlayer1.Model.SetColor(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
-                                  EnsureRange(StrToIntDef(P[2], 0), 0, 255),
-                                  EnsureRange(StrToIntDef(P[3], 0), 0, 255));
-          if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
-        end
-        else

           gPlayer1Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[2], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[3], 0), 0, 255));
           gPlayer1Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[2], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[3], 0), 0, 255));

-  end
-  else if (cmd = 'p2_color') and not g_Game_IsNet then
-  begin
-    if Length(P) > 3 then
-      if g_Game_IsClient then
+          if g_Game_IsClient then
+            MC_SEND_PlayerSettings
+          else if gGameOn and (gPlayer1 <> nil) then
+          begin
+            gPlayer1.SetColor(gPlayer1Settings.Color);
+            if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);
+          end;
+        end;
+      end;
+    'p2_color':

       begin
       begin

-        gPlayer2Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
-                                       EnsureRange(StrToIntDef(P[2], 0), 0, 255),
-                                       EnsureRange(StrToIntDef(P[3], 0), 0, 255));
-        MC_SEND_PlayerSettings;
-      end
-      else
-        if gPlayer2 <> nil then
+        if Length(P) > 3 then

         begin
         begin

-          gPlayer2.Model.SetColor(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
-                                  EnsureRange(StrToIntDef(P[2], 0), 0, 255),
-                                  EnsureRange(StrToIntDef(P[3], 0), 0, 255));
-          if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
-        end
-        else

           gPlayer2Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[2], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[3], 0), 0, 255));
           gPlayer2Settings.Color := _RGB(EnsureRange(StrToIntDef(P[1], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[2], 0), 0, 255),
                                          EnsureRange(StrToIntDef(P[3], 0), 0, 255));

-  end
-  else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
-  begin
-    if cmd = 'r_showtime' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gShowTime := (P[1][1] = '1');
-
-      if gShowTime then
-        g_Console_Add(_lc[I_MSG_TIME_ON])
-      else
-        g_Console_Add(_lc[I_MSG_TIME_OFF]);
-    end
-    else if cmd = 'r_showscore' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gShowGoals := (P[1][1] = '1');
-
-      if gShowGoals then
-        g_Console_Add(_lc[I_MSG_SCORE_ON])
-      else
-        g_Console_Add(_lc[I_MSG_SCORE_OFF]);
-    end
-    else if cmd = 'r_showstat' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gShowStat := (P[1][1] = '1');
-
-      if gShowStat then
-        g_Console_Add(_lc[I_MSG_STATS_ON])
-      else
-        g_Console_Add(_lc[I_MSG_STATS_OFF]);
-    end
-    else if cmd = 'r_showkillmsg' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gShowKillMsg := (P[1][1] = '1');
-
-      if gShowKillMsg then
-        g_Console_Add(_lc[I_MSG_KILL_MSGS_ON])
-      else
-        g_Console_Add(_lc[I_MSG_KILL_MSGS_OFF]);
-    end
-    else if cmd = 'r_showlives' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gShowLives := (P[1][1] = '1');
-
-      if gShowLives then
-        g_Console_Add(_lc[I_MSG_LIVES_ON])
-      else
-        g_Console_Add(_lc[I_MSG_LIVES_OFF]);
-    end
-    else if cmd = 'r_showspect' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gSpectHUD := (P[1][1] = '1');
-
-      if gSpectHUD then
-        g_Console_Add(_lc[I_MSG_SPECT_HUD_ON])
-      else
-        g_Console_Add(_lc[I_MSG_SPECT_HUD_OFF]);
-    end
-    else if cmd = 'r_showping' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        gShowPing := (P[1][1] = '1');
-
-      if gShowPing then
-        g_Console_Add(_lc[I_MSG_PING_ON])
-      else
-        g_Console_Add(_lc[I_MSG_PING_OFF]);
-    end
-    else if (cmd = 'g_scorelimit') and not g_Game_IsClient then
-    begin
-      if Length(P) > 1 then
+          if g_Game_IsClient then
+            MC_SEND_PlayerSettings
+          else if gGameOn and (gPlayer2 <> nil) then
+          begin
+            gPlayer2.SetColor(gPlayer2Settings.Color);
+            if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
+          end;
+        end;
+      end;
+    'p1_model':

       begin
       begin

-        if StrToIntDef(P[1], gGameSettings.GoalLimit) = 0 then
-          gGameSettings.GoalLimit := 0
-        else
+        if (Length(P) > 1) then
+        begin
+          gPlayer1Settings.Model := P[1];
+          if g_Game_IsClient then
+            MC_SEND_PlayerSettings
+          else if gGameOn and (gPlayer1 <> nil) then

           begin
           begin

-            b := 0;
-
-            if gGameSettings.GameMode = GM_DM then
-              begin // DM
-                stat := g_Player_GetStats();
-                if stat <> nil then
-                  for a := 0 to High(stat) do
-                    if stat[a].Frags > b then
-                      b := stat[a].Frags;
-              end
-            else // TDM/CTF
-              b := Max(gTeamStat[TEAM_RED].Goals, gTeamStat[TEAM_BLUE].Goals);
-
-            gGameSettings.GoalLimit := Max(StrToIntDef(P[1], gGameSettings.GoalLimit), b);
+            gPlayer1.FActualModelName := gPlayer1Settings.Model;
+            gPlayer1.SetModel(gPlayer1Settings.Model);
+            if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer1.UID);

           end;
           end;

-
-        if g_Game_IsNet then MH_SEND_GameSettings;
+        end;

       end;
       end;

-
-      g_Console_Add(Format(_lc[I_MSG_SCORE_LIMIT], [gGameSettings.GoalLimit]));
-    end
-    else if (cmd = 'g_timelimit') and not g_Game_IsClient then
-    begin
-      if (Length(P) > 1) and (StrToIntDef(P[1], -1) >= 0) then
-        gGameSettings.TimeLimit := StrToIntDef(P[1], -1);
-
-      g_Console_Add(Format(_lc[I_MSG_TIME_LIMIT],
-                           [gGameSettings.TimeLimit div 3600,
-                           (gGameSettings.TimeLimit div 60) mod 60,
-                            gGameSettings.TimeLimit mod 60]));
-      if g_Game_IsNet then MH_SEND_GameSettings;
-    end
-    else if (cmd = 'g_maxlives') and not g_Game_IsClient then
-    begin
-      if Length(P) > 1 then
+    'p2_model':

       begin
       begin

-        if StrToIntDef(P[1], gGameSettings.MaxLives) = 0 then
-          gGameSettings.MaxLives := 0
-        else
+        if (Length(P) > 1) then

         begin
         begin

-          b := 0;
-          stat := g_Player_GetStats();
-          if stat <> nil then
-            for a := 0 to High(stat) do
-              if stat[a].Lives > b then
-                b := stat[a].Lives;
-          gGameSettings.MaxLives :=
-            Max(StrToIntDef(P[1], gGameSettings.MaxLives), b);
+          gPlayer2Settings.Model := P[1];
+          if g_Game_IsClient then
+            MC_SEND_PlayerSettings
+          else if gGameOn and (gPlayer2 <> nil) then
+          begin
+            gPlayer2.FActualModelName := gPlayer2Settings.Model;
+            gPlayer2.SetModel(gPlayer2Settings.Model);
+            if g_Game_IsNet then MH_SEND_PlayerSettings(gPlayer2.UID);
+          end;
+        end;
+      end;
+    'p1_team':
+      begin
+        // TODO: switch teams if in game or store this separately
+        if (Length(P) > 1) then
+        begin
+          team := ParseTeam(P[1]);
+          if team = TEAM_NONE then
+            g_Console_Add('expected ''red'', ''blue'', 1 or 2')
+          else if not gGameOn and not g_Game_IsNet then
+            gPlayer1Settings.Team := team
+          else
+            g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);
+        end;
+      end;
+    'p2_team':
+      begin
+        // TODO: switch teams if in game or store this separately
+        if (Length(P) > 1) then
+        begin
+          team := ParseTeam(P[1]);
+          if team = TEAM_NONE then
+            g_Console_Add('expected ''red'', ''blue'', 1 or 2')
+          else if not gGameOn and not g_Game_IsNet then
+            gPlayer2Settings.Team := team
+          else
+            g_Console_Add(_lc[I_MSG_ONMAPCHANGE]);

         end;
       end;
         end;
       end;

-
-      g_Console_Add(Format(_lc[I_MSG_LIVES],
-                           [gGameSettings.MaxLives]));
-      if g_Game_IsNet then MH_SEND_GameSettings;
-    end;

   end;
 end;
 
   end;
 end;
 

+procedure PrintHeapStats();
+var
+  hs: TFPCHeapStatus;
+begin
+  hs := GetFPCHeapStatus();
+  e_LogWriteLn ('v===== heap status =====v');
+  e_LogWriteFln('max heap size = %d k', [hs.MaxHeapSize div 1024]);
+  e_LogWriteFln('max heap used = %d k', [hs.MaxHeapUsed div 1024]);
+  e_LogWriteFln('cur heap size = %d k', [hs.CurrHeapSize div 1024]);
+  e_LogWriteFln('cur heap used = %d k', [hs.CurrHeapUsed div 1024]);
+  e_LogWriteFln('cur heap free = %d k', [hs.CurrHeapFree div 1024]);
+  e_LogWriteLn ('^=======================^');
+end;

 
 

-procedure DebugCommands(P: SArray);
+procedure DebugCommands(P: SSArray);

 var
   a, b: Integer;
   cmd: string;
   //pt: TDFPoint;
   mon: TMonster;
 begin
 var
   a, b: Integer;
   cmd: string;
   //pt: TDFPoint;
   mon: TMonster;
 begin

-// Êîìàíäû îòëàäî÷íîãî ðåæèìà:
-  if gDebugMode then
+// Команды отладочного режима:
+  if {gDebugMode}conIsCheatsEnabled then

   begin
     cmd := LowerCase(P[0]);
     if cmd = 'd_window' then
     begin
   begin
     cmd := LowerCase(P[0]);
     if cmd = 'd_window' then
     begin

-      g_Console_Add(Format('gWinPosX = %d, gWinPosY %d', [gWinPosX, gWinPosY]));
-      g_Console_Add(Format('gWinRealPosX = %d, gWinRealPosY %d', [gWinRealPosX, gWinRealPosY]));

       g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
       g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));

-      g_Console_Add(Format('gWinSizeX = %d, gWinSizeY = %d', [gWinSizeX, gWinSizeY]));
-      g_Console_Add(Format('Frame X = %d, Y = %d, Caption Y = %d', [gWinFrameX, gWinFrameY, gWinCaption]));
+      g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));

     end
     else if cmd = 'd_sounds' then
     begin
     end
     else if cmd = 'd_sounds' then
     begin


@@ -5078,18 +4221,19 @@ begin
     end
     else if cmd = 'd_monster' then
     begin
     end
     else if cmd = 'd_monster' then
     begin

-      if gGameOn and (gPlayer1 <> nil) and (gPlayer1.Live) and (not g_Game_IsNet) then
+      if gGameOn and (gPlayer1 <> nil) and (gPlayer1.alive) and (not g_Game_IsNet) then

         if Length(P) < 2 then
         begin
           g_Console_Add(cmd + ' [ID | Name] [behaviour]');
           g_Console_Add('ID | Name');
           for b := MONSTER_DEMON to MONSTER_MAN do
         if Length(P) < 2 then
         begin
           g_Console_Add(cmd + ' [ID | Name] [behaviour]');
           g_Console_Add('ID | Name');
           for b := MONSTER_DEMON to MONSTER_MAN do

-            g_Console_Add(Format('%2d | %s', [b, g_Monsters_GetNameByID(b)]));
+            g_Console_Add(Format('%2d | %s', [b, g_Mons_NameByTypeId(b)]));
+          conwriteln('behav.   num'#10'normal    0'#10'killer    1'#10'maniac    2'#10'insane    3'#10'cannibal  4'#10'good      5');

         end else
         begin
           a := StrToIntDef(P[1], 0);
           if (a < MONSTER_DEMON) or (a > MONSTER_MAN) then
         end else
         begin
           a := StrToIntDef(P[1], 0);
           if (a < MONSTER_DEMON) or (a > MONSTER_MAN) then

-            a := g_Monsters_GetIDByName(P[1]);
+            a := g_Mons_TypeIdByName(P[1]);

 
           if (a < MONSTER_DEMON) or (a > MONSTER_MAN) then
             g_Console_Add(Format(_lc[I_MSG_NO_MONSTER], [P[1]]))
 
           if (a < MONSTER_DEMON) or (a > MONSTER_MAN) then
             g_Console_Add(Format(_lc[I_MSG_NO_MONSTER], [P[1]]))


@@ -5103,7 +4247,17 @@ begin
                      gPlayer1.Direction, True);
               end;
               if (Length(P) > 2) and (mon <> nil) then
                      gPlayer1.Direction, True);
               end;
               if (Length(P) > 2) and (mon <> nil) then

-                mon.MonsterBehaviour := Min(Max(StrToIntDef(P[2], BH_NORMAL), BH_NORMAL), BH_GOOD);
+              begin
+                     if (CompareText(P[2], 'normal') = 0) then mon.MonsterBehaviour := BH_NORMAL
+                else if (CompareText(P[2], 'killer') = 0) then mon.MonsterBehaviour := BH_KILLER
+                else if (CompareText(P[2], 'maniac') = 0) then mon.MonsterBehaviour := BH_MANIAC
+                else if (CompareText(P[2], 'insane') = 0) then mon.MonsterBehaviour := BH_INSANE
+                else if (CompareText(P[2], 'cannibal') = 0) then mon.MonsterBehaviour := BH_CANNIBAL
+                else if (CompareText(P[2], 'good') = 0) then mon.MonsterBehaviour := BH_GOOD
+                else if (CompareText(P[2], 'friend') = 0) then mon.MonsterBehaviour := BH_GOOD
+                else if (CompareText(P[2], 'friendly') = 0) then mon.MonsterBehaviour := BH_GOOD
+                else mon.MonsterBehaviour := Min(Max(StrToIntDef(P[2], BH_NORMAL), BH_NORMAL), BH_GOOD);
+              end;

             end;
         end;
     end
             end;
         end;
     end


@@ -5123,10 +4277,9 @@ begin
 
       g_Console_Add(Format(cmd + ' is %d', [Byte(g_Debug_Player)]));
     end
 
       g_Console_Add(Format(cmd + ' is %d', [Byte(g_Debug_Player)]));
     end

-    else if (cmd = 'd_joy') then
+    else if (cmd = 'd_mem') then

     begin
     begin

-      for a := 1 to 8 do
-        g_Console_Add(e_JoystickStateToString(a));
+      PrintHeapStats();

     end;
   end
     else
     end;
   end
     else


@@ -5134,14 +4287,13 @@ begin
 end;
 
 
 end;
 
 

-procedure GameCheats(P: SArray);
+procedure GameCheats(P: SSArray);

 var
   cmd: string;
   f, a: Integer;
   plr: TPlayer;
 begin
 var
   cmd: string;
   f, a: Integer;
   plr: TPlayer;
 begin

-  if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and
-     (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then
+  if (not gGameOn) or (not conIsCheatsEnabled) then

   begin
     g_Console_Add('not available');
     exit;
   begin
     g_Console_Add('not available');
     exit;


@@ -5179,7 +4331,8 @@ begin
             begin
               g_Console_Add('player left the map');
               gExitByTrigger := True;
             begin
               g_Console_Add('player left the map');
               gExitByTrigger := True;

-              g_Game_ExitLevel(gTriggers[a].Data.MapName);
+              //g_Game_ExitLevel(gTriggers[a].Data.MapName);
+              g_Game_ExitLevel(gTriggers[a].tgcMap);

               break;
             end;
           end;
               break;
             end;
           end;


@@ -5349,7 +4502,7 @@ begin
   end;
 end;
 
   end;
 end;
 

-procedure GameCommands(P: SArray);
+procedure GameCommands(P: SSArray);

 var
   a, b: Integer;
   s, pw: String;
 var
   a, b: Integer;
   s, pw: String;


@@ -5360,21 +4513,15 @@ var
   prt: Word;
   nm: Boolean;
   listen: LongWord;
   prt: Word;
   nm: Boolean;
   listen: LongWord;

+  found: Boolean;

 begin
 begin

-// Îáùèå êîìàíäû:
+// Общие команды:

   cmd := LowerCase(P[0]);
   chstr := '';
   cmd := LowerCase(P[0]);
   chstr := '';

-  if (cmd = 'quit') or
-     (cmd = 'exit') then
-  begin
-    g_Game_Free();
-    g_Game_Quit();
-    Exit;
-  end
-  else if cmd = 'pause' then
+  if cmd = 'pause' then

   begin
     if (g_ActiveWindow = nil) then
   begin
     if (g_ActiveWindow = nil) then

-      g_Game_Pause(not gPause);
+      g_Game_Pause(not gPauseMain);

   end
   else if cmd = 'endgame' then
     gExit := EXIT_SIMPLE
   end
   else if cmd = 'endgame' then
     gExit := EXIT_SIMPLE


@@ -5414,23 +4561,21 @@ begin
         enet_peer_disconnect(pl^.Peer, NET_DISC_KICK);
         g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
         MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
         enet_peer_disconnect(pl^.Peer, NET_DISC_KICK);
         g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
         MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);

-        if NetUseMaster then
-          g_Net_Slist_Update;
+        g_Net_Slist_ServerPlayerLeaves();

       end else if gPlayers <> nil then
         for a := Low(gPlayers) to High(gPlayers) do
           if gPlayers[a] <> nil then
             if Copy(LowerCase(gPlayers[a].Name), 1, Length(P[1])) = LowerCase(P[1]) then
             begin
       end else if gPlayers <> nil then
         for a := Low(gPlayers) to High(gPlayers) do
           if gPlayers[a] <> nil then
             if Copy(LowerCase(gPlayers[a].Name), 1, Length(P[1])) = LowerCase(P[1]) then
             begin

-              // Íå îòêëþ÷àòü îñíîâíûõ èãðîêîâ â ñèíãëå
+              // Не отключать основных игроков в сингле

               if not(gPlayers[a] is TBot) and (gGameSettings.GameType = GT_SINGLE) then
                 continue;
               gPlayers[a].Lives := 0;
               gPlayers[a].Kill(K_SIMPLEKILL, 0, HIT_DISCON);
               g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [gPlayers[a].Name]), True);
               g_Player_Remove(gPlayers[a].UID);
               if not(gPlayers[a] is TBot) and (gGameSettings.GameType = GT_SINGLE) then
                 continue;
               gPlayers[a].Lives := 0;
               gPlayers[a].Kill(K_SIMPLEKILL, 0, HIT_DISCON);
               g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [gPlayers[a].Name]), True);
               g_Player_Remove(gPlayers[a].UID);

-              if NetUseMaster then
-                g_Net_Slist_Update;
-              // Åñëè íå ïåðåìåøàòü, ïðè äîáàâëåíèè íîâûõ áîòîâ ïîÿâÿòñÿ ñòàðûå
+              g_Net_Slist_ServerPlayerLeaves();
+              // Если не перемешать, при добавлении новых ботов появятся старые

               g_Bot_MixNames();
             end;
     end else
               g_Bot_MixNames();
             end;
     end else


@@ -5460,13 +4605,40 @@ begin
           enet_peer_disconnect(NetClients[a].Peer, NET_DISC_KICK);
           g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
           MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
           enet_peer_disconnect(NetClients[a].Peer, NET_DISC_KICK);
           g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
           MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);

-          if NetUseMaster then
-            g_Net_Slist_Update;
+          g_Net_Slist_ServerPlayerLeaves();

         end;
       end;
     end else
       g_Console_Add(_lc[I_MSG_SERVERONLY]);
   end
         end;
       end;
     end else
       g_Console_Add(_lc[I_MSG_SERVERONLY]);
   end

+  else if cmd = 'kick_pid' then
+  begin
+    if g_Game_IsServer and g_Game_IsNet then
+    begin
+      if Length(P) < 2 then
+      begin
+        g_Console_Add('kick_pid <player ID>');
+        Exit;
+      end;
+      if P[1] = '' then
+      begin
+        g_Console_Add('kick_pid <player ID>');
+        Exit;
+      end;
+
+      a := StrToIntDef(P[1], 0);
+      pl := g_Net_Client_ByPlayer(a);
+      if (pl <> nil) and pl^.Used and (pl^.Peer <> nil) then
+      begin
+        s := g_Net_ClientName_ByID(pl^.ID);
+        enet_peer_disconnect(pl^.Peer, NET_DISC_KICK);
+        g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
+        MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
+        g_Net_Slist_ServerPlayerLeaves();
+      end;
+    end else
+      g_Console_Add(_lc[I_MSG_SERVERONLY]);
+  end

   else if cmd = 'ban' then
   begin
     if g_Game_IsServer and g_Game_IsNet then
   else if cmd = 'ban' then
   begin
     if g_Game_IsServer and g_Game_IsNet then


@@ -5490,8 +4662,7 @@ begin
         enet_peer_disconnect(pl^.Peer, NET_DISC_TEMPBAN);
         g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
         MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
         enet_peer_disconnect(pl^.Peer, NET_DISC_TEMPBAN);
         g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
         MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);

-        if NetUseMaster then
-          g_Net_Slist_Update;
+        g_Net_Slist_ServerPlayerLeaves();

       end else
         g_Console_Add(Format(_lc[I_NET_ERR_NAME404], [P[1]]));
     end else
       end else
         g_Console_Add(Format(_lc[I_NET_ERR_NAME404], [P[1]]));
     end else


@@ -5521,12 +4692,40 @@ begin
           enet_peer_disconnect(NetClients[a].Peer, NET_DISC_TEMPBAN);
           g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
           MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
           enet_peer_disconnect(NetClients[a].Peer, NET_DISC_TEMPBAN);
           g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
           MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);

-          if NetUseMaster then
-            g_Net_Slist_Update;
+          g_Net_Slist_ServerPlayerLeaves();

         end;
     end else
       g_Console_Add(_lc[I_MSG_SERVERONLY]);
   end
         end;
     end else
       g_Console_Add(_lc[I_MSG_SERVERONLY]);
   end

+  else if cmd = 'ban_pid' then
+  begin
+    if g_Game_IsServer and g_Game_IsNet then
+    begin
+      if Length(P) < 2 then
+      begin
+        g_Console_Add('ban_pid <player ID>');
+        Exit;
+      end;
+      if P[1] = '' then
+      begin
+        g_Console_Add('ban_pid <player ID>');
+        Exit;
+      end;
+
+      a := StrToIntDef(P[1], 0);
+      pl := g_Net_Client_ByPlayer(a);
+      if (pl <> nil) and pl^.Used and (pl^.Peer <> nil) then
+      begin
+        s := g_Net_ClientName_ByID(pl^.ID);
+        g_Net_BanHost(pl^.Peer^.address.host, False);
+        enet_peer_disconnect(pl^.Peer, NET_DISC_TEMPBAN);
+        g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
+        MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
+        g_Net_Slist_ServerPlayerLeaves();
+      end;
+    end else
+      g_Console_Add(_lc[I_MSG_SERVERONLY]);
+  end

   else if cmd = 'permban' then
   begin
     if g_Game_IsServer and g_Game_IsNet then
   else if cmd = 'permban' then
   begin
     if g_Game_IsServer and g_Game_IsNet then


@@ -5551,8 +4750,7 @@ begin
         g_Net_SaveBanList();
         g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
         MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
         g_Net_SaveBanList();
         g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
         MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);

-        if NetUseMaster then
-          g_Net_Slist_Update;
+        g_Net_Slist_ServerPlayerLeaves();

       end else
         g_Console_Add(Format(_lc[I_NET_ERR_NAME404], [P[1]]));
     end else
       end else
         g_Console_Add(Format(_lc[I_NET_ERR_NAME404], [P[1]]));
     end else


@@ -5583,12 +4781,62 @@ begin
           g_Net_SaveBanList();
           g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
           MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
           g_Net_SaveBanList();
           g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
           MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);

-          if NetUseMaster then
-            g_Net_Slist_Update;
+          g_Net_Slist_ServerPlayerLeaves();

         end;
     end else
       g_Console_Add(_lc[I_MSG_SERVERONLY]);
   end
         end;
     end else
       g_Console_Add(_lc[I_MSG_SERVERONLY]);
   end

+  else if cmd = 'permban_pid' then
+  begin
+    if g_Game_IsServer and g_Game_IsNet then
+    begin
+      if Length(P) < 2 then
+      begin
+        g_Console_Add('permban_pid <player ID>');
+        Exit;
+      end;
+      if P[1] = '' then
+      begin
+        g_Console_Add('permban_pid <player ID>');
+        Exit;
+      end;
+
+      a := StrToIntDef(P[1], 0);
+      pl := g_Net_Client_ByPlayer(a);
+      if (pl <> nil) and pl^.Used and (pl^.Peer <> nil) then
+      begin
+        s := g_Net_ClientName_ByID(pl^.ID);
+        g_Net_BanHost(pl^.Peer^.address.host);
+        enet_peer_disconnect(pl^.Peer, NET_DISC_BAN);
+        g_Net_SaveBanList();
+        g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
+        MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
+        g_Net_Slist_ServerPlayerLeaves();
+      end;
+    end else
+      g_Console_Add(_lc[I_MSG_SERVERONLY]);
+  end
+  else if cmd = 'permban_ip' then
+  begin
+    if g_Game_IsServer and g_Game_IsNet then
+    begin
+      if Length(P) < 2 then
+      begin
+        g_Console_Add('permban_ip <IP address>');
+        Exit;
+      end;
+      if P[1] = '' then
+      begin
+        g_Console_Add('permban_ip <IP address>');
+        Exit;
+      end;
+
+      g_Net_BanHost(P[1]);
+      g_Net_SaveBanList();
+      g_Console_Add(Format(_lc[I_PLAYER_BAN], [P[1]]));
+    end else
+      g_Console_Add(_lc[I_MSG_SERVERONLY]);
+  end

   else if cmd = 'unban' then
   begin
     if g_Game_IsServer and g_Game_IsNet then
   else if cmd = 'unban' then
   begin
     if g_Game_IsServer and g_Game_IsNet then


@@ -5684,7 +4932,9 @@ begin
   else if (cmd = 'addbot') or
      (cmd = 'bot_add') then
   begin
   else if (cmd = 'addbot') or
      (cmd = 'bot_add') then
   begin

-    if Length(P) > 1 then
+    if Length(P) > 2 then
+      g_Bot_Add(TEAM_NONE, StrToIntDef(P[1], 2), StrToIntDef(P[2], 100))
+    else if Length(P) > 1 then

       g_Bot_Add(TEAM_NONE, StrToIntDef(P[1], 2))
     else
       g_Bot_Add(TEAM_NONE, 2);
       g_Bot_Add(TEAM_NONE, StrToIntDef(P[1], 2))
     else
       g_Bot_Add(TEAM_NONE, 2);


@@ -5692,10 +4942,14 @@ begin
   else if cmd = 'bot_addlist' then
   begin
     if Length(P) > 1 then
   else if cmd = 'bot_addlist' then
   begin
     if Length(P) > 1 then

+    begin

       if Length(P) = 2 then
         g_Bot_AddList(TEAM_NONE, P[1], StrToIntDef(P[1], -1))
       if Length(P) = 2 then
         g_Bot_AddList(TEAM_NONE, P[1], StrToIntDef(P[1], -1))

+      else if Length(P) = 3 then
+        g_Bot_AddList(TEAM_NONE, P[1], StrToIntDef(P[1], -1), StrToIntDef(P[2], 100))

       else
         g_Bot_AddList(IfThen(P[2] = 'red', TEAM_RED, TEAM_BLUE), P[1], StrToIntDef(P[1], -1));
       else
         g_Bot_AddList(IfThen(P[2] = 'red', TEAM_RED, TEAM_BLUE), P[1], StrToIntDef(P[1], -1));

+    end;

   end
   else if cmd = 'bot_removeall' then
     g_Bot_RemoveAll()
   end
   else if cmd = 'bot_removeall' then
     g_Bot_RemoveAll()


@@ -5768,26 +5022,31 @@ begin
       g_Console_Add(cmd + ' <WAD> [MAP] [# players]');
       Exit;
     end;
       g_Console_Add(cmd + ' <WAD> [MAP] [# players]');
       Exit;
     end;

-    // Èãðà åù¸ íå çàïóùåíà, ñíà÷àëà íàì íàäî çàãðóçèòü êàêîé-òî WAD
-    P[1] := addWadExtension(P[1]);
-    if FileExists(MapsDir + P[1]) then
-    begin
-      // Åñëè êàðòà íå óêàçàíà, áåð¸ì ïåðâóþ êàðòó â ôàéëå
+    // game not started yet, load fist map from some wad
+    found := false;
+    s := addWadExtension(P[1]);
+    found := e_FindResource(AllMapDirs, s);
+    P[1] := s;
+    if found then
+    begin
+      P[1] := ExpandFileName(P[1]);
+      // if map not choosed then set first map

       if Length(P) < 3 then
       begin
         SetLength(P, 3);
       if Length(P) < 3 then
       begin
         SetLength(P, 3);

-        P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
+        P[2] := g_Game_GetFirstMap(P[1]);

       end;
 
       s := P[1] + ':\' + UpperCase(P[2]);
 
       end;
 
       s := P[1] + ':\' + UpperCase(P[2]);
 

-      if g_Map_Exist(MapsDir + s) then
+      if g_Map_Exist(s) then

       begin
       begin

-        // Çàïóñêàåì ñâîþ èãðó
+        // start game

         g_Game_Free();
         with gGameSettings do
         begin
         g_Game_Free();
         with gGameSettings do
         begin

-          GameMode := g_Game_TextToMode(gcGameMode);
+          Options := gsGameFlags;
+          GameMode := g_Game_TextToMode(gsGameMode);

           if gSwitchGameMode <> GM_NONE then
             GameMode := gSwitchGameMode;
           if GameMode = GM_NONE then GameMode := GM_DM;
           if gSwitchGameMode <> GM_NONE then
             GameMode := gSwitchGameMode;
           if GameMode = GM_NONE then GameMode := GM_DM;


@@ -5803,7 +5062,7 @@ begin
         if P[2] = '' then
           g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
         else
         if P[2] = '' then
           g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
         else

-          g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[2])]));
+          g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[2]), P[1]]));

     end else
       g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
   end
     end else
       g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
   end


@@ -5823,43 +5082,47 @@ begin
       Exit;
     prt := StrToIntDef(P[2], 25666);
 
       Exit;
     prt := StrToIntDef(P[2], 25666);
 

-    P[3] := addWadExtension(P[3]);
-    if FileExists(MapsDir + P[3]) then
+    s := addWadExtension(P[3]);
+    found := e_FindResource(AllMapDirs, s);
+    P[3] := s;
+    if found then

     begin
     begin

-      // Åñëè êàðòà íå óêàçàíà, áåð¸ì ïåðâóþ êàðòó â ôàéëå
+      // get first map in wad, if not specified

       if Length(P) < 5 then
       begin
         SetLength(P, 5);
       if Length(P) < 5 then
       begin
         SetLength(P, 5);

-        P[4] := g_Game_GetFirstMap(MapsDir + P[1]);
+        P[4] := g_Game_GetFirstMap(P[1]);

       end;
       end;

-

       s := P[3] + ':\' + UpperCase(P[4]);
       s := P[3] + ':\' + UpperCase(P[4]);

-
-      if g_Map_Exist(MapsDir + s) then
+      if g_Map_Exist(s) then

       begin
       begin

-        // Çàïóñêàåì ñâîþ èãðó
+        // start game

         g_Game_Free();
         with gGameSettings do
         begin
         g_Game_Free();
         with gGameSettings do
         begin

-          GameMode := g_Game_TextToMode(gcGameMode);
-          if gSwitchGameMode <> GM_NONE then
-            GameMode := gSwitchGameMode;
+          Options := gsGameFlags;
+          GameMode := g_Game_TextToMode(gsGameMode);
+          if gSwitchGameMode <> GM_NONE then GameMode := gSwitchGameMode;

           if GameMode = GM_NONE then GameMode := GM_DM;
           if GameMode = GM_SINGLE then GameMode := GM_COOP;
           b := 0;
           if Length(P) >= 6 then
             b := StrToIntDef(P[5], 0);
           if GameMode = GM_NONE then GameMode := GM_DM;
           if GameMode = GM_SINGLE then GameMode := GM_COOP;
           b := 0;
           if Length(P) >= 6 then
             b := StrToIntDef(P[5], 0);

-          g_Game_StartServer(s, GameMode, TimeLimit,
-                             GoalLimit, MaxLives, Options, b, listen, prt);
-        end;
+          g_Game_StartServer(s, GameMode, TimeLimit, GoalLimit, MaxLives, Options, b, listen, prt)
+        end

       end
       else
       end
       else

+      begin

         if P[4] = '' then
           g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[3]]))
         else
         if P[4] = '' then
           g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[3]]))
         else

-          g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[4])]));
-    end else
-      g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[3]]));
+          g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[4]), P[3]]))
+      end
+    end
+    else
+    begin
+      g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[3]]))
+    end

   end
   else if cmd = 'map' then
   begin
   end
   else if cmd = 'map' then
   begin


@@ -5868,91 +5131,126 @@ begin
       if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
       begin
         g_Console_Add(cmd + ' <MAP>');
       if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
       begin
         g_Console_Add(cmd + ' <MAP>');

-        g_Console_Add(cmd + ' <WAD> [MAP]');
-      end else
-        g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
-    end else
+        g_Console_Add(cmd + ' <WAD> [MAP]')
+      end
+      else
+      begin
+        g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+      end
+    end
+    else
+    begin

       if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
       begin
       if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
       begin

-        // Èä¸ò ñâîÿ èãðà èëè ñåðâåð

         if Length(P) < 3 then
         begin
         if Length(P) < 3 then
         begin

-          // Ïåðâûé ïàðàìåòð - ëèáî êàðòà, ëèáî èìÿ WAD ôàéëà
+          // first param is map or wad

           s := UpperCase(P[1]);
           s := UpperCase(P[1]);

-          if g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + s) then
-          begin // Êàðòà íàøëàñü
+          if g_Map_Exist(gGameSettings.WAD + ':\' + s) then
+          begin

             gExitByTrigger := False;
             if gGameOn then
             gExitByTrigger := False;
             if gGameOn then

-            begin // Èä¸ò èãðà - çàâåðøàåì óðîâåíü
+            begin
+              // already in game, finish current map

               gNextMap := s;
               gExit := EXIT_ENDLEVELCUSTOM;
             end
               gNextMap := s;
               gExit := EXIT_ENDLEVELCUSTOM;
             end

-            else // Èíòåðìèññèÿ - ñðàçó çàãðóæàåì êàðòó
-              g_Game_ChangeMap(s);
-          end else
+            else
+            begin
+              // intermission, so change map immediately
+              g_Game_ChangeMap(s)
+            end
+          end
+          else

           begin
           begin

-            g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
-            // Òàêîé êàðòû íåò, èùåì WAD ôàéë
-            P[1] := addWadExtension(P[1]);
-            if FileExists(MapsDir + P[1]) then
+            s := P[1];
+            found := e_FindResource(AllMapDirs, s);
+            P[1] := s;
+            g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, 'WAD ' + P[1]]));
+            if found then

             begin
             begin

-              // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
+              // no such map, found wad
+              pw := P[1];

               SetLength(P, 3);
               SetLength(P, 3);

-              P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
-
+              P[1] := ExpandFileName(pw);
+              P[2] := g_Game_GetFirstMap(P[1]);

               s := P[1] + ':\' + P[2];
               s := P[1] + ':\' + P[2];

-
-              if g_Map_Exist(MapsDir + s) then
+              if g_Map_Exist(s) then

               begin
                 gExitByTrigger := False;
                 if gGameOn then
               begin
                 gExitByTrigger := False;
                 if gGameOn then

-                begin // Èä¸ò èãðà - çàâåðøàåì óðîâåíü
+                begin
+                  // already in game, finish current map

                   gNextMap := s;
                   gNextMap := s;

-                  gExit := EXIT_ENDLEVELCUSTOM;
+                  gExit := EXIT_ENDLEVELCUSTOM

                 end
                 end

-                else // Èíòåðìèññèÿ - ñðàçó çàãðóæàåì êàðòó
-                  g_Game_ChangeMap(s);
-              end else
+                else
+                begin
+                  // intermission, so change map immediately
+                  g_Game_ChangeMap(s)
+                end
+              end
+              else
+              begin

                 if P[2] = '' then
                   g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
                 else
                 if P[2] = '' then
                   g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
                 else

-                  g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
-            end else
-              g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
+                  g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+              end
+            end
+            else
+            begin
+              g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+            end

           end;
           end;

-        end else
+        end
+        else

         begin
         begin

-          // Óêàçàíî äâà ïàðàìåòðà, çíà÷èò ïåðâûé - WAD ôàéë, à âòîðîé - êàðòà
-          P[1] := addWadExtension(P[1]);
-          if FileExists(MapsDir + P[1]) then
+          s := addWadExtension(P[1]);
+          found := e_FindResource(AllMapDirs, s);
+          P[1] := s;
+          if found then

           begin
           begin

-            // Íàøëè WAD ôàéë

             P[2] := UpperCase(P[2]);
             s := P[1] + ':\' + P[2];
             P[2] := UpperCase(P[2]);
             s := P[1] + ':\' + P[2];

-
-            if g_Map_Exist(MapsDir + s) then
-            begin // Íàøëè êàðòó
+            if g_Map_Exist(s) then
+            begin

               gExitByTrigger := False;
               if gGameOn then
               gExitByTrigger := False;
               if gGameOn then

-              begin // Èä¸ò èãðà - çàâåðøàåì óðîâåíü
+              begin

                 gNextMap := s;
                 gNextMap := s;

-                gExit := EXIT_ENDLEVELCUSTOM;
+                gExit := EXIT_ENDLEVELCUSTOM

               end
               end

-              else // Èíòåðìèññèÿ - ñðàçó çàãðóæàåì êàðòó
-                g_Game_ChangeMap(s);
-            end else
-              g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
-          end else
-            g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
-        end;
-      end else
-        g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
+              else
+              begin
+                g_Game_ChangeMap(s)
+              end
+            end
+            else
+            begin
+              g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+            end
+          end
+          else
+          begin
+            g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+          end
+        end
+      end
+      else
+      begin
+        g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+      end
+    end

   end
   else if cmd = 'nextmap' then
   begin
     if not(gGameOn or (gState = STATE_INTERCUSTOM)) then
   end
   else if cmd = 'nextmap' then
   begin
     if not(gGameOn or (gState = STATE_INTERCUSTOM)) then

+    begin

       g_Console_Add(_lc[I_MSG_NOT_GAME])
       g_Console_Add(_lc[I_MSG_NOT_GAME])

-    else begin
+    end
+    else
+    begin

       nm := True;
       if Length(P) = 1 then
       begin
       nm := True;
       if Length(P) = 1 then
       begin


@@ -5960,112 +5258,148 @@ begin
         begin
           g_Console_Add(cmd + ' <MAP>');
           g_Console_Add(cmd + ' <WAD> [MAP]');
         begin
           g_Console_Add(cmd + ' <MAP>');
           g_Console_Add(cmd + ' <WAD> [MAP]');

-        end else begin
+        end
+        else
+        begin

           nm := False;
           g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
         end;
           nm := False;
           g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
         end;

-      end else
+      end
+      else

       begin
         nm := False;
         if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
         begin
           if Length(P) < 3 then
           begin
       begin
         nm := False;
         if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
         begin
           if Length(P) < 3 then
           begin

-            // Ïåðâûé ïàðàìåòð - ëèáî êàðòà, ëèáî èìÿ WAD ôàéëà
+            // first param is map or wad

             s := UpperCase(P[1]);
             s := UpperCase(P[1]);

-            if g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + s) then
-            begin // Êàðòà íàøëàñü
+            if g_Map_Exist(gGameSettings.WAD + ':\' + s) then
+            begin
+              // map founded

               gExitByTrigger := False;
               gNextMap := s;
               nm := True;
               gExitByTrigger := False;
               gNextMap := s;
               nm := True;

-            end else
+            end
+            else

             begin
             begin

-              g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
-              // Òàêîé êàðòû íåò, èùåì WAD ôàéë
-              P[1] := addWadExtension(P[1]);
-              if FileExists(MapsDir + P[1]) then
+              // no such map, found wad
+              pw := addWadExtension(P[1]);
+              found := e_FindResource(MapDirs, pw);
+              if not found then
+                found := e_FindResource(WadDirs, pw);
+              P[1] := pw;
+              g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
+              if found then

               begin
               begin

-                // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
+                // map not specified, select first map

                 SetLength(P, 3);
                 SetLength(P, 3);

-                P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
-
+                P[2] := g_Game_GetFirstMap(P[1]);

                 s := P[1] + ':\' + P[2];
                 s := P[1] + ':\' + P[2];

-
-                if g_Map_Exist(MapsDir + s) then
-                begin // Óñòàíàâëèâàåì êàðòó
+                if g_Map_Exist(s) then
+                begin

                   gExitByTrigger := False;
                   gNextMap := s;
                   gExitByTrigger := False;
                   gNextMap := s;

-                  nm := True;
-                end else
+                  nm := True
+                end
+                else
+                begin

                   if P[2] = '' then
                     g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
                   else
                   if P[2] = '' then
                     g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
                   else

-                    g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
-              end else
-                g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
-            end;
-          end else
+                    g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+                end
+              end
+              else
+              begin
+                g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+              end
+            end
+          end
+          else

           begin
           begin

-            // Óêàçàíî äâà ïàðàìåòðà, çíà÷èò ïåðâûé - WAD ôàéë, à âòîðîé - êàðòà
-            P[1] := addWadExtension(P[1]);
-            if FileExists(MapsDir + P[1]) then
+            // specified two params wad + map
+            pw := addWadExtension(P[1]);
+            found := e_FindResource(MapDirs, pw);
+            if not found then
+              found := e_FindResource(MapDirs, pw);
+            P[1] := pw;
+            if found then

             begin
             begin

-              // Íàøëè WAD ôàéë

               P[2] := UpperCase(P[2]);
               s := P[1] + ':\' + P[2];
               P[2] := UpperCase(P[2]);
               s := P[1] + ':\' + P[2];

-
-              if g_Map_Exist(MapsDir + s) then
-              begin // Íàøëè êàðòó
+              if g_Map_Exist(s) then
+              begin

                 gExitByTrigger := False;
                 gNextMap := s;
                 gExitByTrigger := False;
                 gNextMap := s;

-                nm := True;
-              end else
-                g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
-            end else
-              g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
-          end;
-        end else
-          g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
+                nm := True
+              end
+              else
+              begin
+                g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+              end
+            end
+            else
+            begin
+              g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+            end
+          end
+        end
+        else
+        begin
+          g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+        end

       end;
       if nm then
       end;
       if nm then

+      begin

         if gNextMap = '' then
           g_Console_Add(_lc[I_MSG_NEXTMAP_UNSET])
         else
         if gNextMap = '' then
           g_Console_Add(_lc[I_MSG_NEXTMAP_UNSET])
         else

-          g_Console_Add(Format(_lc[I_MSG_NEXTMAP_SET], [gNextMap]));
-    end;
+          g_Console_Add(Format(_lc[I_MSG_NEXTMAP_SET], [gNextMap]))
+      end
+    end

   end
   else if (cmd = 'endmap') or (cmd = 'goodbye') then
   begin
     if not gGameOn then
   end
   else if (cmd = 'endmap') or (cmd = 'goodbye') then
   begin
     if not gGameOn then

+    begin

       g_Console_Add(_lc[I_MSG_NOT_GAME])
       g_Console_Add(_lc[I_MSG_NOT_GAME])

+    end

     else
     else

+    begin

       if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
       begin
         gExitByTrigger := False;
       if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
       begin
         gExitByTrigger := False;

-        // Ñëåäóþùàÿ êàðòà íå çàäàíà, ïðîáóåì íàéòè òðèããåð Âûõîä
+        // next map not specified, try to find trigger EXIT

         if (gNextMap = '') and (gTriggers <> nil) then
         if (gNextMap = '') and (gTriggers <> nil) then

+        begin

           for a := 0 to High(gTriggers) do
           for a := 0 to High(gTriggers) do

+          begin

             if gTriggers[a].TriggerType = TRIGGER_EXIT then
             begin
               gExitByTrigger := True;
             if gTriggers[a].TriggerType = TRIGGER_EXIT then
             begin
               gExitByTrigger := True;

-              gNextMap := gTriggers[a].Data.MapName;
-              Break;
-            end;
-        // Èùåì ñëåäóþùóþ êàðòó â WAD ôàéëå
+              //gNextMap := gTriggers[a].Data.MapName;
+              gNextMap := gTriggers[a].tgcMap;
+              Break
+            end
+          end
+        end;

         if gNextMap = '' then
           gNextMap := g_Game_GetNextMap();
         if gNextMap = '' then
           gNextMap := g_Game_GetNextMap();

-        // Ïðîâåðÿåì, íå çàäàí ëè WAD ôàéë ðåñóðñíîé ñòðîêîé
-        if Pos(':\', gNextMap) = 0 then
+        if not isWadPath(gNextMap) then

           s := gGameSettings.WAD + ':\' + gNextMap
         else
           s := gNextMap;
           s := gGameSettings.WAD + ':\' + gNextMap
         else
           s := gNextMap;

-        // Åñëè êàðòà íàéäåíà, âûõîäèì ñ óðîâíÿ
-        if g_Map_Exist(MapsDir + s) then
+        if g_Map_Exist(s) then

           gExit := EXIT_ENDLEVELCUSTOM
         else
           gExit := EXIT_ENDLEVELCUSTOM
         else

-          g_Console_Add(Format(_lc[I_MSG_NO_MAP], [gNextMap]));
-      end else
-        g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
+          g_Console_Add(Format(_lc[I_MSG_NO_MAP], [gNextMap]))
+      end
+      else
+      begin
+        g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+      end
+    end

   end
   else if (cmd = 'event') then
   begin
   end
   else if (cmd = 'event') then
   begin


@@ -6101,7 +5435,45 @@ begin
         Exit;
       end;
   end
         Exit;
       end;
   end

-// Êîìàíäû Ñâîåé èãðû:
+  else if cmd = 'suicide' then
+  begin
+    if gGameOn then
+    begin
+      if g_Game_IsClient then
+        MC_SEND_CheatRequest(NET_CHEAT_SUICIDE)
+      else
+      begin
+        if gPlayer1 <> nil then
+          gPlayer1.Damage(SUICIDE_DAMAGE, gPlayer1.UID, 0, 0, HIT_SELF);
+        if gPlayer2 <> nil then
+          gPlayer2.Damage(SUICIDE_DAMAGE, gPlayer2.UID, 0, 0, HIT_SELF);
+      end;
+    end;
+  end
+  else if cmd = 'screenshot' then
+  begin
+    g_TakeScreenShot()
+  end
+  else if cmd = 'weapon' then
+  begin
+    if Length(p) = 2 then
+    begin
+      a := WP_FIRST + StrToInt(p[1]) - 1;
+      if (a >= WP_FIRST) and (a <= WP_LAST) then
+        gSelectWeapon[0, a] := True
+    end
+  end
+  else if (cmd = 'p1_weapon') or (cmd = 'p2_weapon') then
+  begin
+    if Length(p) = 2 then
+    begin
+      a := WP_FIRST + StrToInt(p[1]) - 1;
+      b := ord(cmd[2]) - ord('1');
+      if (a >= WP_FIRST) and (a <= WP_LAST) then
+        gSelectWeapon[b, a] := True
+    end
+  end
+// Команды Своей игры:

   else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
   begin
     if cmd = 'bot_addred' then
   else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
   begin
     if cmd = 'bot_addred' then


@@ -6118,21 +5490,6 @@ begin
       else
         g_Bot_Add(TEAM_BLUE, 2);
     end
       else
         g_Bot_Add(TEAM_BLUE, 2);
     end

-    else if cmd = 'suicide' then
-    begin
-      if gGameOn then
-      begin
-        if g_Game_IsClient then
-          MC_SEND_CheatRequest(NET_CHEAT_SUICIDE)
-        else
-        begin
-          if gPlayer1 <> nil then
-            gPlayer1.Damage(SUICIDE_DAMAGE, gPlayer1.UID, 0, 0, HIT_SELF);
-          if gPlayer2 <> nil then
-            gPlayer2.Damage(SUICIDE_DAMAGE, gPlayer2.UID, 0, 0, HIT_SELF);
-        end;
-      end;
-    end

     else if cmd = 'spectate' then
     begin
       if not gGameOn then
     else if cmd = 'spectate' then
     begin
       if not gGameOn then


@@ -6192,11 +5549,35 @@ begin
       end else
         g_Console_Add(_lc[I_MSG_SERVERONLY]);
     end
       end else
         g_Console_Add(_lc[I_MSG_SERVERONLY]);
     end

+    else if cmd = 'centerprint' then
+    begin
+      if (Length(P) > 2) and (P[1] <> '') then
+      begin
+        chstr := '';
+        for a := 2 to High(P) do
+          chstr := chstr + P[a] + ' ';
+
+        if Length(chstr) > 200 then SetLength(chstr, 200);
+
+        if Length(chstr) < 1 then
+        begin
+          g_Console_Add('centerprint <timeout> <text>');
+          Exit;
+        end;
+
+        a := StrToIntDef(P[1], 100);
+        chstr := b_Text_Format(chstr);
+        g_Game_Message(chstr, a);
+        if g_Game_IsNet and g_Game_IsServer then
+          MH_SEND_GameEvent(NET_EV_BIGTEXT, a, chstr);
+      end
+      else g_Console_Add('centerprint <timeout> <text>');
+    end

     else if (cmd = 'overtime') and not g_Game_IsClient then
     begin
       if (Length(P) = 1) or (StrToIntDef(P[1], -1) <= 0) then
         Exit;
     else if (cmd = 'overtime') and not g_Game_IsClient then
     begin
       if (Length(P) = 1) or (StrToIntDef(P[1], -1) <= 0) then
         Exit;

-      // Äîïîëíèòåëüíîå âðåìÿ:
+      // Дополнительное время:

       gGameSettings.TimeLimit := (gTime - gGameStartTime) div 1000 + Word(StrToIntDef(P[1], 0));
 
       g_Console_Add(Format(_lc[I_MSG_TIME_LIMIT],
       gGameSettings.TimeLimit := (gTime - gGameStartTime) div 1000 + Word(StrToIntDef(P[1], 0));
 
       g_Console_Add(Format(_lc[I_MSG_TIME_LIMIT],


@@ -6297,47 +5678,83 @@ begin
   end;
 end;
 
   end;
 end;
 

-procedure g_TakeScreenShot();
+procedure SystemCommands(P: SSArray);

 var
 var

-  a: Word;
-  FileName: string;
-  ssdir, t: string;
-  st: TStream;
-  ok: Boolean;
+  cmd: string;

 begin
 begin

-  if e_NoGraphics then Exit;
-  ssdir := GameDir+'/screenshots';
-  if not findFileCI(ssdir, true) then
-  begin
-    // try to create dir
-    try
-      CreateDir(ssdir);
-    except
-    end;
-    if not findFileCI(ssdir, true) then exit; // alas
-  end;
-  try
-    for a := 1 to High(Word) do
-    begin
-      FileName := Format(ssdir+'screenshot%.3d.png', [a]);
-      t := FileName;
-      if findFileCI(t, true) then continue;
-      if not findFileCI(FileName) then
+  cmd := LowerCase(P[0]);
+  case cmd of
+    'exit', 'quit':
+      begin
+        g_Game_Free();
+        g_Game_Quit();
+      end;
+    'r_reset':
+       r_Render_Apply;
+    'r_maxfps':

       begin
       begin

-        ok := false;
-        st := createDiskFile(FileName);
-        try
-          e_MakeScreenshot(st, gScreenWidth, gScreenHeight);
-          ok := true;
-        finally
-          st.Free();
+        if Length(p) = 2 then
+        begin
+          gMaxFPS := StrToIntDef(p[1], gMaxFPS);
+          if gMaxFPS > 0 then
+            gFrameTime := 1000 div gMaxFPS
+          else
+            gFrameTime := 0;

         end;
         end;

-        if not ok then try DeleteFile(FileName); except end else g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [ExtractFileName(FileName)]));
-        break;
+        e_LogWritefln('r_maxfps %d', [gMaxFPS]);

       end;
       end;

-    end;
-  except
+    'g_language':
+      begin
+        if Length(p) = 2 then
+        begin
+          gAskLanguage := true;
+          gLanguage := LANGUAGE_ENGLISH;
+          case LowerCase(p[1]) of
+            'english':
+               begin
+                 gAskLanguage := false;
+                 gLanguage := LANGUAGE_ENGLISH;
+               end;
+            'russian':
+               begin
+                 gAskLanguage := false;
+                 gLanguage := LANGUAGE_RUSSIAN;
+               end;
+            'ask':
+               begin
+                 gAskLanguage := true;
+                 gLanguage := LANGUAGE_ENGLISH;
+               end;
+          end;
+          g_Language_Set(gLanguage);
+        end
+        else
+        begin
+          e_LogWritefln('usage: %s <English|Russian|Ask>', [cmd]);
+        end
+      end;
+  end;
+end;
+
+procedure g_TakeScreenShot(Filename: string = '');
+  var t: TDateTime; dir, date, name: String;
+begin
+  if e_NoGraphics then
+    Exit;
+
+  dir := e_GetWriteableDir(ScreenshotDirs);
+  if Filename = '' then
+  begin
+    t := Now;
+    DateTimeToString(date, 'yyyy-mm-dd-hh-nn-ss', t);
+    Filename := 'screenshot-' + date;

   end;
   end;

+
+  name := e_CatPath(dir, Filename + '.png');
+  if r_Render_WriteScreenShot(name) then
+    g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [name]))
+  else
+    g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [name]));

 end;
 
 procedure g_Game_InGameMenu(Show: Boolean);
 end;
 
 procedure g_Game_InGameMenu(Show: Boolean);


@@ -6358,39 +5775,51 @@ begin
       end;
       g_Sound_PlayEx('MENU_OPEN');
 
       end;
       g_Sound_PlayEx('MENU_OPEN');
 

-    // Ïàóçà ïðè ìåíþ òîëüêî â îäèíî÷íîé èãðå:
+    // Пауза при меню только в одиночной игре:

       if (not g_Game_IsNet) then
         g_Game_Pause(True);
     end
   else
     if (g_ActiveWindow <> nil) and (not Show) then
     begin
       if (not g_Game_IsNet) then
         g_Game_Pause(True);
     end
   else
     if (g_ActiveWindow <> nil) and (not Show) then
     begin

-    // Ïàóçà ïðè ìåíþ òîëüêî â îäèíî÷íîé èãðå:
+    // Пауза при меню только в одиночной игре:

       if (not g_Game_IsNet) then
         g_Game_Pause(False);
     end;
 end;
 
       if (not g_Game_IsNet) then
         g_Game_Pause(False);
     end;
 end;
 

-procedure g_Game_Pause(Enable: Boolean);
+procedure g_Game_Pause (Enable: Boolean);
+var
+  oldPause: Boolean;

 begin
 begin

-  if not gGameOn then
-    Exit;
+  if not gGameOn then exit;

 
 

-  if gPause = Enable then
-    Exit;
+  if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit;

 
 

-  if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then
-    Exit;
+  oldPause := gPause;
+  gPauseMain := Enable;

 
 

-  gPause := Enable;
-  g_Game_PauseAllSounds(Enable);
+  if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause);
+end;
+
+procedure g_Game_HolmesPause (Enable: Boolean);
+var
+  oldPause: Boolean;
+begin
+  if not gGameOn then exit;
+  if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit;
+
+  oldPause := gPause;
+  gPauseHolmes := Enable;
+
+  if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause);

 end;
 
 procedure g_Game_PauseAllSounds(Enable: Boolean);
 var
   i: Integer;
 begin
 end;
 
 procedure g_Game_PauseAllSounds(Enable: Boolean);
 var
   i: Integer;
 begin

-// Òðèããåðû:
+// Триггеры:

   if gTriggers <> nil then
     for i := 0 to High(gTriggers) do
       with gTriggers[i] do
   if gTriggers <> nil then
     for i := 0 to High(gTriggers) do
       with gTriggers[i] do


@@ -6401,13 +5830,13 @@ begin
           Sound.Pause(Enable);
         end;
 
           Sound.Pause(Enable);
         end;
 

-// Çâóêè èãðîêîâ:
+// Звуки игроков:

   if gPlayers <> nil then
     for i := 0 to High(gPlayers) do
       if gPlayers[i] <> nil then
         gPlayers[i].PauseSounds(Enable);
 
   if gPlayers <> nil then
     for i := 0 to High(gPlayers) do
       if gPlayers[i] <> nil then
         gPlayers[i].PauseSounds(Enable);
 

-// Ìóçûêà:
+// Музыка:

   if gMusic <> nil then
     gMusic.Pause(Enable);
 end;
   if gMusic <> nil then
     gMusic.Pause(Enable);
 end;


@@ -6430,27 +5859,14 @@ begin
     e_StopChannels();
 end;
 
     e_StopChannels();
 end;
 

-procedure g_Game_UpdateTriggerSounds();
-var
-  i: Integer;
+procedure g_Game_UpdateTriggerSounds;
+  var i: Integer;

 begin
   if gTriggers <> nil then
     for i := 0 to High(gTriggers) do
       with gTriggers[i] do
 begin
   if gTriggers <> nil then
     for i := 0 to High(gTriggers) do
       with gTriggers[i] do

-        if (TriggerType = TRIGGER_SOUND) and
-           (Sound <> nil) and
-           (Data.Local) and
-           Sound.IsPlaying() then
-        begin
-          if ((gPlayer1 <> nil) and g_CollidePoint(gPlayer1.GameX, gPlayer1.GameY, X, Y, Width, Height)) or
-             ((gPlayer2 <> nil) and g_CollidePoint(gPlayer2.GameX, gPlayer2.GameY, X, Y, Width, Height)) then
-          begin
-            Sound.SetPan(0.5 - Data.Pan/255.0);
-            Sound.SetVolume(Data.Volume/255.0);
-          end
-          else
-            Sound.SetCoords(X+(Width div 2), Y+(Height div 2), Data.Volume/255.0);
-        end;
+        if (TriggerType = TRIGGER_SOUND) and (Sound <> nil) and tgcLocal and Sound.IsPlaying() then
+          Sound.SetCoordsRect(X, Y, Width, Height, tgcVolume / 255.0)

 end;
 
 function g_Game_IsWatchedPlayer(UID: Word): Boolean;
 end;
 
 function g_Game_IsWatchedPlayer(UID: Word): Boolean;


@@ -6516,10 +5932,76 @@ end;
 
 procedure g_Game_Message(Msg: string; Time: Word);
 begin
 
 procedure g_Game_Message(Msg: string; Time: Word);
 begin

-  MessageText := b_Text_Format(Msg);
+  MessageLineLength := (gScreenWidth - 204) div e_CharFont_GetMaxWidth(gMenuFont);
+  MessageText := b_Text_Wrap(b_Text_Format(Msg), MessageLineLength);

   MessageTime := Time;
 end;
 
   MessageTime := Time;
 end;
 

+procedure g_Game_ChatSound(Text: String; Taunt: Boolean = True);
+const
+  punct: Array[0..13] of String =
+  ('.', ',', ':', ';', '!', '?', '(', ')', '''', '"', '/', '\', '*', '^');
+var
+  i, j: Integer;
+  ok: Boolean;
+  fpText: String;
+
+  function IsPunctuation(S: String): Boolean;
+  var
+    i: Integer;
+  begin
+    Result := False;
+    if Length(S) <> 1 then
+      Exit;
+    for i := Low(punct) to High(punct) do
+      if S = punct[i] then
+      begin
+        Result := True;
+        break;
+      end;
+  end;
+  function FilterPunctuation(S: String): String;
+  var
+    i: Integer;
+  begin
+    for i := Low(punct) to High(punct) do
+      S := StringReplace(S, punct[i], ' ', [rfReplaceAll]);
+    Result := S;
+  end;
+begin
+  ok := False;
+
+  if gUseChatSounds and Taunt and (gChatSounds <> nil) and (Pos(': ', Text) > 0) then
+  begin
+    // remove player name
+    Delete(Text, 1, Pos(': ', Text) + 2 - 1);
+    // for FullWord check
+    Text := toLowerCase1251(' ' + Text + ' ');
+    fpText := FilterPunctuation(Text);
+
+    for i := 0 to Length(gChatSounds) - 1 do
+    begin
+      ok := True;
+      for j := 0 to Length(gChatSounds[i].Tags) - 1 do
+      begin
+        if gChatSounds[i].FullWord and (not IsPunctuation(gChatSounds[i].Tags[j])) then
+          ok := Pos(' ' + gChatSounds[i].Tags[j] + ' ', fpText) > 0
+        else
+          ok := Pos(gChatSounds[i].Tags[j], Text) > 0;
+        if not ok then
+          break;
+      end;
+      if ok then
+      begin
+        gChatSounds[i].Sound.Play();
+        break;
+      end;
+    end;
+  end;
+  if not ok then
+    g_Sound_PlayEx('SOUND_GAME_RADIO');
+end;
+

 procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
 var
   a: Integer;
 procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
 var
   a: Integer;


@@ -6592,6 +6074,24 @@ begin
   killsnd[n].Play();
 end;
 
   killsnd[n].Play();
 end;
 

+procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
+var
+  a: Integer;
+begin
+  case gAnnouncer of
+    ANNOUNCE_NONE:
+      Exit;
+    ANNOUNCE_ME:
+      if not g_Game_IsWatchedPlayer(SpawnerUID) then
+        Exit;
+  end;
+  for a := 0 to 2 do
+    if hahasnd[a].IsPlaying() then
+      Exit;
+
+  hahasnd[Random(3)].Play();
+end;
+

 procedure g_Game_StartVote(Command, Initiator: string);
 var
   Need: Integer;
 procedure g_Game_StartVote(Command, Initiator: string);
 var
   Need: Integer;


@@ -6703,7 +6203,7 @@ end;
 procedure g_Game_SetDebugMode();
 begin
   gDebugMode := True;
 procedure g_Game_SetDebugMode();
 begin
   gDebugMode := True;

-// ×èòû (äàæå â ñâîåé èãðå):
+// Читы (даже в своей игре):

   gCheats := True;
 end;
 
   gCheats := True;
 end;
 


@@ -6717,7 +6217,7 @@ begin
   with LoadingStat do
   begin
     if not reWrite then
   with LoadingStat do
   begin
     if not reWrite then

-    begin // Ïåðåõîäèì íà ñëåäóþùóþ ñòðîêó èëè ñêðîëëèðóåì:
+    begin // Переходим на следующую строку или скроллируем:

       if NextMsg = Length(Msgs) then
         begin // scroll
           for i := 0 to High(Msgs)-1 do
       if NextMsg = Length(Msgs) then
         begin // scroll
           for i := 0 to High(Msgs)-1 do


@@ -6733,23 +6233,29 @@ begin
     CurValue := 0;
     MaxValue := Max;
     ShowCount := 0;
     CurValue := 0;
     MaxValue := Max;
     ShowCount := 0;

+    PBarWasHere := false;

   end;
 
   g_ActiveWindow := nil;
 
   end;
 
   g_ActiveWindow := nil;
 

-  ProcessLoading;
+  ProcessLoading(true);

 end;
 
 end;
 

-procedure g_Game_StepLoading();
+procedure g_Game_StepLoading(Value: Integer = -1);

 begin
   with LoadingStat do
   begin
 begin
   with LoadingStat do
   begin

-    Inc(CurValue);
-    Inc(ShowCount);
-    if (ShowCount > LOADING_SHOW_STEP) then
+    if Value = -1 then
+    begin
+      Inc(CurValue);
+      Inc(ShowCount);
+    end
+    else
+      CurValue := Value;
+    if (ShowCount > LOADING_SHOW_STEP) or (Value > -1) then

     begin
       ShowCount := 0;
     begin
       ShowCount := 0;

-      ProcessLoading;
+      ProcessLoading();

     end;
   end;
 end;
     end;
   end;
 end;


@@ -6769,6 +6275,7 @@ begin
     for len := Low(Msgs) to High(Msgs) do
       Msgs[len] := '';
     NextMsg := 0;
     for len := Low(Msgs) to High(Msgs) do
       Msgs[len] := '';
     NextMsg := 0;

+    PBarWasHere := false;

   end;
 end;
 
   end;
 end;
 


@@ -6785,7 +6292,7 @@ begin
     if (s[1] = '-') and (Length(s) > 1) then
     begin
       if (s[2] = '-') and (Length(s) > 2) then
     if (s[1] = '-') and (Length(s) > 1) then
     begin
       if (s[2] = '-') and (Length(s) > 2) then

-        begin // Îäèíî÷íûé ïàðàìåòð
+        begin // Одиночный параметр

           SetLength(pars, Length(pars) + 1);
           with pars[High(pars)] do
           begin
           SetLength(pars, Length(pars) + 1);
           with pars[High(pars)] do
           begin


@@ -6795,7 +6302,7 @@ begin
         end
       else
         if (i < ParamCount) then
         end
       else
         if (i < ParamCount) then

-        begin // Ïàðàìåòð ñî çíà÷åíèåì
+        begin // Параметр со значением

           Inc(i);
           SetLength(pars, Length(pars) + 1);
           with pars[High(pars)] do
           Inc(i);
           SetLength(pars, Length(pars) + 1);
           with pars[High(pars)] do


@@ -6909,40 +6416,47 @@ begin
   // Options:
     s := Find_Param_Value(pars, '-opt');
     if (s = '') then
   // Options:
     s := Find_Param_Value(pars, '-opt');
     if (s = '') then

-      Opt := GAME_OPTION_ALLOWEXIT or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER
+      Opt := gsGameFlags

     else
       Opt := StrToIntDef(s, 0);
     else
       Opt := StrToIntDef(s, 0);

-    if Opt = 0 then
-      Opt := GAME_OPTION_ALLOWEXIT or GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;

 
   // Close after map:
     s := Find_Param_Value(pars, '--close');
     if (s <> '') then
       gMapOnce := True;
 
 
   // Close after map:
     s := Find_Param_Value(pars, '--close');
     if (s <> '') then
       gMapOnce := True;
 

+  // Override map to test:
+    s := LowerCase(Find_Param_Value(pars, '-testmap'));
+    if s <> '' then
+    begin
+      if e_IsValidResourceName(s) then
+        e_FindResource(AllMapDirs, s);
+      gTestMap := ExpandFileName(s);
+    end;
+

   // Delete test map after play:
     s := Find_Param_Value(pars, '--testdelete');
     if (s <> '') then
     begin
   // Delete test map after play:
     s := Find_Param_Value(pars, '--testdelete');
     if (s <> '') then
     begin

-      gMapToDelete := MapsDir + map;
-      e_WriteLog('"--testdelete" is deprecated, use --tempdelete.', MSG_FATALERROR);
+      //gMapToDelete := MapsDir + map;
+      e_WriteLog('"--testdelete" is deprecated, use --tempdelete.', TMsgType.Fatal);

       Halt(1);
     end;
 
   // Delete temporary WAD after play:
     s := Find_Param_Value(pars, '--tempdelete');
       Halt(1);
     end;
 
   // Delete temporary WAD after play:
     s := Find_Param_Value(pars, '--tempdelete');

-    if (s <> '') then
+    if (s <> '') and (gTestMap <> '') then

     begin
     begin

-      gMapToDelete := MapsDir + map;
+      gMapToDelete := gTestMap;

       gTempDelete := True;
     end;
 
   // Number of players:
     s := Find_Param_Value(pars, '-pl');
     if (s = '') then
       gTempDelete := True;
     end;
 
   // Number of players:
     s := Find_Param_Value(pars, '-pl');
     if (s = '') then

-      n := 1
+      n := DEFAULT_PLAYERS

     else
     else

-      n := StrToIntDef(s, 1);
+      n := StrToIntDef(s, DEFAULT_PLAYERS);

 
   // Start:
     s := Find_Param_Value(pars, '-port');
 
   // Start:
     s := Find_Param_Value(pars, '-port');


@@ -6956,20 +6470,20 @@ begin
   s := Find_Param_Value(pars, '-exec');
   if s <> '' then
   begin
   s := Find_Param_Value(pars, '-exec');
   if s <> '' then
   begin

-    if Pos(':\', s) = 0 then
-      s := GameDir + '/' + s;
+//    if not isWadPath(s) then
+//      s := GameDir + '/' + s;

 
     {$I-}
     AssignFile(F, s);
     Reset(F);
     if IOResult <> 0 then
     begin
 
     {$I-}
     AssignFile(F, s);
     Reset(F);
     if IOResult <> 0 then
     begin

-      e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), MSG_WARNING);
+      e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), TMsgType.Warning);

       g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
       CloseFile(F);
       Exit;
     end;
       g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
       CloseFile(F);
       Exit;
     end;

-    e_WriteLog('Executing script: ' + s, MSG_NOTIFY);
+    e_WriteLog('Executing script: ' + s, TMsgType.Notify);

     g_Console_Add(Format(_lc[I_CONSOLE_EXEC], [s]));
 
     while not EOF(F) do
     g_Console_Add(Format(_lc[I_CONSOLE_EXEC], [s]));
 
     while not EOF(F) do


@@ -6977,7 +6491,7 @@ begin
       ReadLn(F, s);
       if IOResult <> 0 then
       begin
       ReadLn(F, s);
       if IOResult <> 0 then
       begin

-        e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), MSG_WARNING);
+        e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), TMsgType.Warning);

         g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
         CloseFile(F);
         Exit;
         g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
         CloseFile(F);
         Exit;


@@ -7010,5 +6524,25 @@ begin
   conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true);
   conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true);
 
   conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true);
   conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true);
 

+{$IFDEF ENABLE_HOLMES}

   conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true);
   conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true);

+{$ENDIF}
+
+  conRegVar('dbg_ignore_level_bounds', @g_dbg_ignore_bounds, 'ignore level bounds', '',  false);
+
+  conRegVar('light_enabled', @gwin_k8_enable_light_experiments, 'enable/disable dynamic lighting', 'lighting');
+  conRegVar('light_player_halo', @g_playerLight, 'enable/disable player halo', 'player light halo');
+
+  conRegVar('r_smallmap_align_h', @r_smallmap_h, 'halign: 0: left; 1: center; 2: right', 'horizontal aligning of small maps');
+  conRegVar('r_smallmap_align_v', @r_smallmap_v, 'valign: 0: top; 1: center; 2: bottom', 'vertial aligning of small maps');
+
+  conRegVar('r_showfps', @gShowFPS, 'draw fps counter', 'draw fps counter');
+  conRegVar('r_showtime', @gShowTime, 'show game time', 'show game time');
+  conRegVar('r_showping', @gShowPing, 'show ping', 'show ping');
+  conRegVar('r_showscore', @gShowGoals, 'show score', 'show score');
+  conRegVar('r_showkillmsg', @gShowKillMsg, 'show kill log', 'show kill log');
+  conRegVar('r_showlives', @gShowLives, 'show lives', 'show lives');
+  conRegVar('r_showspect', @gSpectHUD, 'show spectator hud', 'show spectator hud');
+  conRegVar('r_showstat', @gShowStat, 'show stats', 'show stats');
+  conRegVar('r_showpids', @gShowPIDs, 'show PIDs', 'show PIDs');

 end.
 end.