From b4525976960c0e55b2d7ee99ad83947d2b2c1a85 Mon Sep 17 00:00:00 2001 From: thecelloman Date: Wed, 20 Mar 2013 16:51:42 -0400 Subject: [PATCH] Removing the controlsHelpDlg to reduce maintenance overhead. --- .../Full/game/art/gui/controlsHelpDlg.gui | 130 ------------------ .../Full/game/scripts/client/default.bind.cs | 8 -- Templates/Full/game/scripts/client/game.cs | 1 - Templates/Full/game/scripts/client/init.cs | 1 - .../game/scripts/client/serverConnection.cs | 1 - 5 files changed, 141 deletions(-) delete mode 100644 Templates/Full/game/art/gui/controlsHelpDlg.gui diff --git a/Templates/Full/game/art/gui/controlsHelpDlg.gui b/Templates/Full/game/art/gui/controlsHelpDlg.gui deleted file mode 100644 index dc5629d17..000000000 --- a/Templates/Full/game/art/gui/controlsHelpDlg.gui +++ /dev/null @@ -1,130 +0,0 @@ -//--- OBJECT WRITE BEGIN --- -%guiContent = new GuiControl(ControlsHelpDlg) { - position = "0 0"; - Extent = "1024 768"; - MinExtent = "8 8"; - horizSizing = "right"; - vertSizing = "bottom"; - profile = "GuiModelessDialogProfile"; - Visible = "1"; - active = "1"; - tooltipprofile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "1"; - canSave = "1"; - canSaveDynamicFields = "1"; - noCursor = "1"; - - new GuiBitmapBorderCtrl() { - position = "820 -3"; - extent = "204 680"; - minExtent = "8 8"; - HorizSizing = "left"; - VertSizing = "bottom"; - profile = "ChatHudBorderProfile"; - Visible = "1"; - active = "1"; - tooltipprofile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - - new GuiBitmapCtrl() { - bitmap = "art/gui/hudfill.png"; - wrap = "0"; - position = "8 8"; - extent = "188 665"; - MinExtent = "8 8"; - horizSizing = "width"; - vertSizing = "height"; - profile = "GuiDefaultProfile"; - Visible = "1"; - active = "1"; - tooltipprofile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; - new GuiMLTextCtrl(ControlsText) { - lineSpacing = "2"; - allowColorChars = "0"; - maxChars = "-1"; - text = "This is a test"; - useURLMouseCursor = "0"; - position = "12 10"; - extent = "180 652"; - MinExtent = "8 8"; - horizSizing = "width"; - vertSizing = "relative"; - profile = "HudTextNormalProfile"; - Visible = "1"; - active = "1"; - tooltipprofile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; - }; -}; -//--- OBJECT WRITE END --- - - -function ControlsHelpDlg::onWake(%this) -{ - %text = "Default Control Setup\n\n"@ - - "MOVEMENT\n"@ - "WASDForward/Back/Left/Right\n"@ - "SpaceJump\n"@ - "XCrouch\n\n"@ - - "VEHICLE CONTROLS\n"@ - "W/DDrive Forward/Back\n"@ - "Mouse MoveSteer left/right\n"@ - "SpaceBrake\n"@ - "MountingJust walk into vehicle\n"@ - "Ctrl-FExit car\n"@ - "Ctrl-XFlip Car\n\n"@ - - - "WEAPONS\n"@ - "Mouse L-ButtonFire\n"@ - "Mouse R-ButtonAlt-fire\n"@ - "0Unmount weapon\n"@ - "Alt-WThrow weapon\n"@ - "Alt-AThrow ammo\n\n"@ - - "VIEW CONTROL\n"@ - "ZToggle Zoom mode\n"@ - "FCycle zoom FOV\n"@ - "TabFirst/Third person camera\n"@ - "VVanity view\n"@ - "Alt-CToggle between camera/player\n\n"@ - - "EDITORS\n"@ - "F10Open GUI Editor\n"@ - "F11Open Level Editor\n\n"@ - - "MISC FUNCTIONS\n"@ - "Alt-CToggle between camera/player\n"@ - "F7Drop Player At Camera\n"@ - "F8Drop Camera At Player\n"@ - "USend public chat message\n"@ - "Ctrl-KDie\n"@ - "Ctrl-OOpen Options dialog\n"@ - "Ctrl-HToggle Hide HUDs\n"@ - "Alt-PHudless Screenshot\n"@ - "HHide this help HUD"; - ControlsText.setText(%text); -} - -function ControlsHelpDlg::toggle(%this) -{ - if (%this.isAwake()) - Canvas.popDialog(%this); - else - Canvas.pushDialog(%this); -} diff --git a/Templates/Full/game/scripts/client/default.bind.cs b/Templates/Full/game/scripts/client/default.bind.cs index 8cc875a2b..ad6a3aee9 100644 --- a/Templates/Full/game/scripts/client/default.bind.cs +++ b/Templates/Full/game/scripts/client/default.bind.cs @@ -47,14 +47,6 @@ function showPlayerList(%val) moveMap.bind( keyboard, F2, showPlayerList ); -function showControlsHelp(%val) -{ - if (%val) - ControlsHelpDlg.toggle(); -} - -moveMap.bind(keyboard, h, showControlsHelp); - function hideHUDs(%val) { if (%val) diff --git a/Templates/Full/game/scripts/client/game.cs b/Templates/Full/game/scripts/client/game.cs index 979587acd..2f27c8598 100644 --- a/Templates/Full/game/scripts/client/game.cs +++ b/Templates/Full/game/scripts/client/game.cs @@ -27,7 +27,6 @@ function clientCmdGameStart(%seq) { PlayerListGui.zeroScores(); - ControlsHelpDlg.toggle(); } function clientCmdGameEnd(%seq) diff --git a/Templates/Full/game/scripts/client/init.cs b/Templates/Full/game/scripts/client/init.cs index ef006e5c5..83014f7dc 100644 --- a/Templates/Full/game/scripts/client/init.cs +++ b/Templates/Full/game/scripts/client/init.cs @@ -74,7 +74,6 @@ function initClient() exec("art/gui/ChatHud.gui"); exec("art/gui/playerList.gui"); exec("art/gui/hudlessGui.gui"); - exec("art/gui/controlsHelpDlg.gui"); // Load up the shell GUIs exec("art/gui/mainMenuGui.gui"); diff --git a/Templates/Full/game/scripts/client/serverConnection.cs b/Templates/Full/game/scripts/client/serverConnection.cs index a1f84c163..c50478212 100644 --- a/Templates/Full/game/scripts/client/serverConnection.cs +++ b/Templates/Full/game/scripts/client/serverConnection.cs @@ -56,7 +56,6 @@ function GameConnection::initialControlSet(%this) if (Canvas.getContent() != PlayGui.getId()) { Canvas.setContent(PlayGui); - ControlsHelpDlg.toggle(); } } }