get rid of "rulez", "kastet" and "pulemet" in symbols; also some cosmetics and small...

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

diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index 415d7efebe416edef48d18c1868876c1c9885d72..55302688c55c807547219faa4d47d2c81bf5d1e1 100644 (file)
--- a/src/game/g_gui.pas
+++ b/src/game/g_gui.pas
@@ -552,7 +552,7 @@ implementation
 uses
   {$INCLUDE ../nogl/noGLuses.inc}
   g_textures, g_sound, SysUtils, e_res,
-  g_game, Math, StrUtils, g_player, g_options,
+  g_game, Math, StrUtils, g_player, g_options, g_console,
   g_map, g_weapons, xdynrec, wadreader;
 
 
@@ -2472,7 +2472,7 @@ begin
                 actDefCtl();
               end;
           else
-            if e_KeyNames[wParam] <> '' then
+            if (e_KeyNames[wParam] <> '') and not g_Console_MatchBind(wParam, 'togglemenu') then
               FKey := wParam;
             FIsQuery := False;
             actDefCtl();
@@ -2620,7 +2620,7 @@ begin
                 actDefCtl();
               end;
           else
-            if e_KeyNames[wParam] <> '' then
+            if (e_KeyNames[wParam] <> '') and not g_Console_MatchBind(wParam, 'togglemenu') then
             begin
               if (FKeyIdx = 0) then FKey0 := wParam else FKey1 := wParam;
             end;
@@ -2675,10 +2675,9 @@ begin
   if FModel = nil then
     Exit;
 
-  if FModel.Weapon < WP_LAST then
-    FModel.SetWeapon(FModel.Weapon+1)
-  else
-    FModel.SetWeapon(WEAPON_KASTET);
+  if FModel.Weapon < WP_LAST
+    then FModel.SetWeapon(FModel.Weapon+1)
+    else FModel.SetWeapon(WEAPON_IRONFIST);
 end;
 
 procedure TGUIModelView.OnMessage(var Msg: TMessage);
@@ -3232,13 +3231,13 @@ begin
                   begin
                     if FItems[FIndex] = #29 + '..' then
                     begin
-                      e_LogWritefln('TGUIFileListBox: Upper dir "%s" -> "%s"', [FSubPath, e_UpperDir(FSubPath)]);
+                      //e_LogWritefln('TGUIFileListBox: Upper dir "%s" -> "%s"', [FSubPath, e_UpperDir(FSubPath)]);
                       FSubPath := e_UpperDir(FSubPath)
                     end
                     else
                     begin
                       s := Copy(AnsiString(FItems[FIndex]), 2);
-                      e_LogWritefln('TGUIFileListBox: Enter dir "%s" -> "%s"', [FSubPath, e_CatPath(FSubPath, s)]);
+                      //e_LogWritefln('TGUIFileListBox: Enter dir "%s" -> "%s"', [FSubPath, e_CatPath(FSubPath, s)]);
                       FSubPath := e_CatPath(FSubPath, s);
                     end;
                     ScanDirs;