Net: Headless server starts with 0 players by default

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

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 3014b68338454e5f9f55f549356b816123fce3a0..35f667bf432ce2678561f40920e28d44ac93df0f 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -23,7 +23,7 @@ uses
   MAPDEF,
   g_basic, g_player, e_graphics, g_res_downloader,
   g_sound, g_gui, utils, md5, mempool, xprofiler,
   MAPDEF,
   g_basic, g_player, e_graphics, g_res_downloader,
   g_sound, g_gui, utils, md5, mempool, xprofiler,

-  g_touch;
+  g_touch, g_weapons;

 
 type
   TGameSettings = record
 
 type
   TGameSettings = record


@@ -142,6 +142,7 @@ procedure g_Game_StepLoading(Value: Integer = -1);
 procedure g_Game_ClearLoading();
 procedure g_Game_SetDebugMode();
 procedure DrawLoadingStat();
 procedure g_Game_ClearLoading();
 procedure g_Game_SetDebugMode();
 procedure DrawLoadingStat();

+procedure DrawMenuBackground(tex: AnsiString);

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


@@ -216,6 +217,12 @@ const
 
   STD_PLAYER_MODEL = 'Doomer';
 
 
   STD_PLAYER_MODEL = 'Doomer';
 

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

 var
   gStdFont: DWORD;
   gGameSettings: TGameSettings;
 var
   gStdFont: DWORD;
   gGameSettings: TGameSettings;


@@ -250,7 +257,7 @@ var
   gTotalMonsters: Integer = 0;
   gPauseMain: Boolean = false;
   gPauseHolmes: Boolean = false;
   gTotalMonsters: Integer = 0;
   gPauseMain: Boolean = false;
   gPauseHolmes: Boolean = false;

-  gShowTime: Boolean = True;
+  gShowTime: Boolean = False;

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


@@ -325,6 +332,8 @@ var
   gDelayedEvents: Array of TDelayedEvent;
   gUseChatSounds: Boolean = True;
   gChatSounds: Array of TChatSound;
   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
 
   g_dbg_ignore_bounds: Boolean = false;
   r_smallmap_h: Integer = 0; // 0: left; 1: center; 2: right


@@ -372,7 +381,7 @@ uses
 {$ENDIF}
   e_texture, g_textures, g_main, g_window, g_menu,
   e_input, e_log, g_console, g_items, g_map, g_panel,
 {$ENDIF}
   e_texture, 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,
+  g_playermodel, g_gfx, g_options, Math,

   g_triggers, g_monsters, e_sound, CONFIG,
   g_language, g_net,
   ENet, e_msg, g_netmsg, g_netmaster,
   g_triggers, g_monsters, e_sound, CONFIG,
   g_language, g_net,
   ENet, e_msg, g_netmsg, g_netmaster,


@@ -567,7 +576,6 @@ var
   FPSCounter, UPSCounter: Word;
   FPSTime, UPSTime: LongWord;
   DataLoaded: Boolean = False;
   FPSCounter, UPSCounter: Word;
   FPSTime, UPSTime: LongWord;
   DataLoaded: Boolean = False;

-  LastScreenShot: Int64;

   IsDrawStat: Boolean = False;
   CustomStat: TEndCustomGameStat;
   SingleStat: TEndSingleGameStat;
   IsDrawStat: Boolean = False;
   CustomStat: TEndCustomGameStat;
   SingleStat: TEndSingleGameStat;


@@ -578,6 +586,7 @@ var
   MessageLineLength: Integer = 80;
   MapList: SSArray = nil;
   MapIndex: Integer = -1;
   MessageLineLength: Integer = 80;
   MapList: SSArray = nil;
   MapIndex: Integer = -1;

+  InterReadyTime: Integer = -1;

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


@@ -978,6 +987,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;


@@ -992,6 +1002,8 @@ begin
         end;
 
         g_Game_ExecuteEvent('onmapend');
         end;
 
         g_Game_ExecuteEvent('onmapend');

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

 
       // Çàòóõàþùèé ýêðàí:
         EndingGameCounter := 255;
 
       // Çàòóõàþùèé ýêðàí:
         EndingGameCounter := 255;


@@ -1271,10 +1283,12 @@ begin
   sfsGCDisable(); // temporary disable removing of temporary volumes
 
   try
   sfsGCDisable(); // temporary disable removing of temporary volumes
 
   try

+    TEXTUREFILTER := GL_LINEAR;

     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');
     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');

+    TEXTUREFILTER := GL_NEAREST;

 
     LoadStdFont('STDTXT', 'STDFONT', gStdFont);
     LoadFont('MENUTXT', 'MENUFONT', gMenuFont);
 
     LoadStdFont('STDTXT', 'STDFONT', gStdFont);
     LoadFont('MENUTXT', 'MENUFONT', gMenuFont);


@@ -1315,7 +1329,6 @@ begin
     gPauseMain := false;
     gPauseHolmes := false;
     gTime := 0;
     gPauseMain := false;
     gPauseHolmes := false;
     gTime := 0;

-    LastScreenShot := 0;

 
     {e_MouseInfo.Accel := 1.0;}
 
 
     {e_MouseInfo.Accel := 1.0;}
 


@@ -1325,7 +1338,7 @@ begin
     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_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_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True, True);

     g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
 
     g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);
     g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
 
     g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);


@@ -1501,68 +1514,78 @@ retry:
     goto retry;
 end;
 
     goto retry;
 end;
 

-function isKeyPressed (key1: Word; key2: Word): Boolean;
-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;
-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(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 isKeyPressed(KeyLeft, KeyLeft2) then plr.SetDirection(TDirection.D_LEFT)
-      // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî:
-      else if (MoveButton = 1) and isKeyPressed(KeyRight, KeyRight2) then plr.SetDirection(TDirection.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


@@ -1581,6 +1604,14 @@ 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_Update();
 var
   Msg: g_gui.TMessage;
 procedure g_Game_Update();
 var
   Msg: g_gui.TMessage;


@@ -1666,12 +1697,14 @@ begin
           (
             (
               e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE) or
           (
             (
               e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE) or

-              e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN)
+              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)))

         )
         then
         begin // Íàæàëè <Enter>/<Ïðîáåë> èëè ïðîøëî äîñòàòî÷íî âðåìåíè:
         )
         then
         begin // Íàæàëè <Enter>/<Ïðîáåë> èëè ïðîøëî äîñòàòî÷íî âðåìåíè:


@@ -1706,6 +1739,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


@@ -1720,6 +1769,7 @@ 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');


@@ -1759,31 +1809,9 @@ begin
         g_Serverlist_Control(slCurrent, slTable);
   end;
 
         g_Serverlist_Control(slCurrent, slTable);
   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) or e_KeyPressed(VK_CHAT) then
-            g_Console_Chat_Switch(False)
-          else if (e_KeyPressed(gGameControls.GameControls.TeamChat) or e_KeyPressed(VK_TEAM)) 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))
-             and (not e_KeyPressed(VK_CHAT))
-             and (not e_KeyPressed(VK_TEAM)) then
-            gChatEnter := True;
-

 // Ñòàòèñòèêà ïî Tab:
   if gGameOn then
 // Ñòàòèñòèêà ïî Tab:
   if gGameOn then

-    IsDrawStat := (not gConsoleShow) and (not gChatShow) and
-                  (gGameSettings.GameType <> GT_SINGLE) and
-                  (e_KeyPressed(gGameControls.GameControls.Stat) or e_KeyPressed(VK_STATUS));
+    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
 
 // Èãðà èäåò:
   if gGameOn and not gPause and (gState <> STATE_FOLD) then


@@ -1858,8 +1886,8 @@ begin
       if gPlayer2 <> nil then gPlayer2.ReleaseKeys();
       if (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
       begin
       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


@@ -1874,8 +1902,7 @@ begin
     begin
       if not gSpectKeyPress then
       begin
     begin
       if not gSpectKeyPress then
       begin

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

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


@@ -1889,21 +1916,21 @@ begin
         if (gSpectMode = SPECT_MAPVIEW)
            and (not gSpectAuto) then
         begin
         if (gSpectMode = SPECT_MAPVIEW)
            and (not gSpectAuto) then
         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;
           begin
             // increase step
             if gSpectStep < 64 then gSpectStep := gSpectStep shl 1;


@@ -1913,44 +1940,44 @@ begin
         if (gSpectMode = SPECT_PLAYERS)
            and (not gSpectAuto) then
         begin
         if (gSpectMode = SPECT_PLAYERS)
            and (not gSpectAuto) then
         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 isKeyPressed(gGameControls.P1Control.KeyFire, gGameControls.P1Control.KeyFire2) then
+        if gPlayerAction[0, ACTION_ATTACK] then

         begin
           if (gSpectMode = SPECT_STATS) and (not gSpectAuto) then
           begin
         begin
           if (gSpectMode = SPECT_STATS) and (not gSpectAuto) then
           begin


@@ -1969,14 +1996,14 @@ begin
         end;
       end
       else
         end;
       end
       else

-        if (not isKeyPressed(gGameControls.P1Control.KeyJump, gGameControls.P1Control.KeyJump2)) and
-           (not isKeyPressed(gGameControls.P1Control.KeyFire, gGameControls.P1Control.KeyFire2)) 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;
 
       if gSpectAuto then
           gSpectKeyPress := False;
 
       if gSpectAuto then


@@ -2151,14 +2178,6 @@ begin
     end;
   end;
 
     end;
   end;
 

-// Äåëàåì ñêðèíøîò (íå ÷àùå 200 ìèëëèñåêóíä):
-  if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) or e_KeyPressed(VK_PRINTSCR) then
-    if (GetTimer()-LastScreenShot) > 200000 div 1000 then
-    begin
-      g_TakeScreenShot();
-      LastScreenShot := GetTimer();
-    end;
-

 // Ãîðÿ÷àÿ êëàâèøà äëÿ âûçîâà ìåíþ âûõîäà èç èãðû (F10):
   if e_KeyPressed(IK_F10) and
      gGameOn and
 // Ãîðÿ÷àÿ êëàâèøà äëÿ âûçîâà ìåíþ âûõîäà èç èãðû (F10):
   if e_KeyPressed(IK_F10) and
      gGameOn and


@@ -2526,7 +2545,7 @@ begin
 
   g_ProcessMessages();
 
 
   g_ProcessMessages();
 

-  if e_KeyPressed(IK_TAB) or e_KeyPressed(VK_STATUS) then
+  if g_Console_Action(ACTION_SCORES) then

   begin
     if not gStatsPressed then
     begin
   begin
     if not gStatsPressed then
     begin


@@ -2712,9 +2731,12 @@ begin
               gg := g;
               bb := b;
             end;
               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);
+            if (gPlayers[Num] <> nil) and (gPlayers[Num].FReady) then
+              e_TextureFontPrintEx(x+16, _y, Name + ' *', gStdFont, rr, gg, bb, 1)
+            else
+              e_TextureFontPrintEx(x+16, _y, Name, gStdFont, rr, gg, bb, 1);
+            e_TextureFontPrintEx(x+w1+16, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
+            e_TextureFontPrintEx(x+w1+w2+16, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);

             _y := _y+24;
           end;
 
             _y := _y+24;
           end;
 


@@ -2739,7 +2761,10 @@ begin
         else
           r := 255;
 
         else
           r := 255;
 

-        e_TextureFontPrintEx(x+8+16+8, _y+4, Name, gStdFont, r, r, r, 1, True);
+        if (gPlayers[Num] <> nil) and (gPlayers[Num].FReady) then
+          e_TextureFontPrintEx(x+8+16+8, _y+4, Name + ' *', gStdFont, r, r, r, 1, True)
+        else
+          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;
         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;


@@ -2986,6 +3011,25 @@ begin
   end;
 end;
 
   end;
 end;
 

+procedure DrawMenuBackground(tex: AnsiString);
+var
+  w, h: Word;
+  ID: DWord;
+
+begin
+  if g_Texture_Get(tex, ID) then
+  begin
+    e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+    e_GetTextureSize(ID, @w, @h);
+    if w = h then
+      w := round(w * 1.333 * (gScreenHeight / h))
+    else
+      w := trunc(w * (gScreenHeight / h));
+    e_DrawSize(ID, (gScreenWidth - w) div 2, 0, 0, False, False, w, gScreenHeight);
+  end
+  else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+end;
+

 procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
 var
   a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;
 procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
 var
   a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;


@@ -3888,11 +3932,7 @@ begin
   begin
     if (gState = STATE_MENU) then
     begin
   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) or (g_ActiveWindow.BackTexture = '') then DrawMenuBackground('MENU_BACKGROUND');

       // F3 at menu will show game loading dialog
       if e_KeyPressed(IK_F3) then g_Menu_Show_LoadMenu(true);
       if (g_ActiveWindow <> nil) then
       // F3 at menu will show game loading dialog
       if e_KeyPressed(IK_F3) then g_Menu_Show_LoadMenu(true);
       if (g_ActiveWindow <> nil) then


@@ -3927,10 +3967,7 @@ begin
       else
         back := 'INTER';
 
       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);
+      DrawMenuBackground(back);

 
       DrawCustomStat();
 
 
       DrawCustomStat();
 


@@ -3951,10 +3988,7 @@ begin
       begin
         back := 'INTER';
 
       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);
+        DrawMenuBackground(back);

 
         DrawSingleStat();
 
 
         DrawSingleStat();
 


@@ -3986,12 +4020,13 @@ begin
 
     if gState = STATE_SLIST then
     begin
 
     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;
+//      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);
+//      end;
+      DrawMenuBackground('MENU_BACKGROUND');
+      e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);

       g_Serverlist_Draw(slCurrent, slTable);
     end;
   end;
       g_Serverlist_Draw(slCurrent, slTable);
     end;
   end;


@@ -4021,7 +4056,7 @@ begin
     e_TextureFontPrint(0, 16, Format('UPS: %d', [UPS]), gStdFont);
   end;
 
     e_TextureFontPrint(0, 16, Format('UPS: %d', [UPS]), gStdFont);
   end;
 

-  if gGameOn and gShowTime and (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT]) then
+  if gGameOn and gShowTime then

     drawTime(gScreenWidth-72, gScreenHeight-16);
 
   if gGameOn then drawProfilers();
     drawTime(gScreenWidth-72, gScreenHeight-16);
 
   if gGameOn then drawProfilers();


@@ -4669,7 +4704,8 @@ begin
 
     ProcessLoading(true);
 
 
     ProcessLoading(true);
 

-    if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_ESCAPE) then
+    if e_KeyPressed(IK_SPACE) or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
+       e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then

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


@@ -5183,18 +5219,7 @@ var
 begin
   stat := nil;
   cmd := LowerCase(P[0]);
 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');
-
-    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
+  if (cmd = 'g_friendlyfire') and not g_Game_IsClient then

   begin
     with gGameSettings do
     begin
   begin
     with gGameSettings do
     begin


@@ -5564,18 +5589,7 @@ begin
   end
   else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
   begin
   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
+    if cmd = 'r_showscore' then

     begin
       if (Length(P) > 1) and
          ((P[1] = '1') or (P[1] = '0')) then
     begin
       if (Length(P) > 1) and
          ((P[1] = '1') or (P[1] = '0')) then


@@ -5842,11 +5856,6 @@ 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
-    begin
-      for a := 1 to 8 do
-        g_Console_Add(e_JoystickStateToString(a));
-    end

     else if (cmd = 'd_mem') then
     begin
       PrintHeapStats();
     else if (cmd = 'd_mem') then
     begin
       PrintHeapStats();


@@ -6407,7 +6416,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);


@@ -6415,10 +6426,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()


@@ -6615,12 +6630,13 @@ begin
           end else
           begin
             // Òàêîé êàðòû íåò, èùåì WAD ôàéë
           end else
           begin
             // Òàêîé êàðòû íåò, èùåì WAD ôàéë

-            P[1] := addWadExtension(P[1]);
-            g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
-            if FileExists(MapsDir + P[1]) then
+            pw := findDiskWad(MapsDir + P[1]);
+            g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, 'WAD ' + P[1]]));
+            if FileExists(pw) then

             begin
               // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
               SetLength(P, 3);
             begin
               // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
               SetLength(P, 3);

+              P[1] := ExtractRelativePath(MapsDir, pw);

               P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
 
               s := P[1] + ':\' + P[2];
               P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
 
               s := P[1] + ':\' + P[2];


@@ -6840,6 +6856,29 @@ begin
       end;
     end;
   end
       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
 // Êîìàíäû Ñâîåé èãðû:
   else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
   begin


@@ -7773,9 +7812,9 @@ begin
   // Number of players:
     s := Find_Param_Value(pars, '-pl');
     if (s = '') then
   // 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');


@@ -7856,4 +7895,7 @@ begin
 
   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_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');

 end.
 end.