From 5fd5ff9f9de01526ef0280385ec5360eee3e1fb8 Mon Sep 17 00:00:00 2001 From: driAn Date: Wed, 15 Oct 2008 19:49:02 +0000 Subject: [PATCH] tweaked menus git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3047 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus.cfg | 4 ++-- config/menus_edit.cfg | 4 ++-- config/menus_multiplayer.cfg | 26 ++++++++++++----------- config/menus_settings.cfg | 40 +++++++++++++++++++----------------- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/config/menus.cfg b/config/menus.cfg index a74d0fef..d6c95c22 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -9,7 +9,7 @@ menuitem "Demo" "showmenu demo" menuitem "Editing" "showmenu editing" menuitem "Help" "showmenu help" menuitem "About" "showmenu about" -menuitem "Quit" "savequit" +menuitem " 2Quit" "savequit" // Start maps. @@ -69,7 +69,7 @@ menuitem "by 'Rabid Viper Productions'" "showmenu credits" menuitem "http://assault.cubers.net" "echo sorry no built-in web browser yet :)" menuitem "a cube mod/tc based on the" "" menuitem "" -menuitem "Cube game/engine" "" +menuitem "Cube Engine" "" menuitem "by Wouter 'Aardappel' van Oortmerssen" "" menuitem "and others" "" menuitem "http://www.cubeengine.com/" "echo sorry no built-in web browser yet :)" diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index 2e110d04..4ee35f91 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -24,7 +24,7 @@ newmenu "White light" menuitemslider "Light radius: " 1 32 " " 1 "" "alias wlight $arg1" menuitemslider "Brightness: " 1 255 " " 5 "" "alias wlight1 $arg1" menuitem "" -menuitem " [ OK ] " "newent light $wlight $wlight1" +menuitem " 2 [ OK ] " "newent light $wlight $wlight1" newmenu "Coloured light" @@ -35,7 +35,7 @@ menuitemslider "Red light: " 1 255 " " 5 "" "alias clight1 $arg1" menuitemslider "Green light: " 1 255 " " 5 "" "alias clight2 $arg1" menuitemslider "Blue light: " 1 255 " " 5 "" "alias clight3 $arg1" menuitem "" -menuitem " [ OK ] " "newent light $clight $clight1 $clight2 $clight3" +menuitem " 2 [ OK ] " "newent light $clight $clight1 $clight2 $clight3" //Entities menu newmenu Entities diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index 47d9de6f..8e27cc87 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -1,28 +1,30 @@ -//Menu that is shown when escape is pressed connected in-game. +// Menu that is shown when escape is pressed connected in-game + newmenu "In-game" - -menuitem "Change mode/map" "showmenu Gamemode" +menuitem "Change name" "showmenu Name" +menuitem "Change team" "showmenu Team" +menuitem "Change weapon" "showmenu Weapons" +menuitem "Change player skin" [showmenu (at [CLA RVSF] (curteam))] +menuitem "" "" +menuitem "Set mode/map" "showmenu Gamemode" menuitem "Kick/ban player" "showmenu kick/ban" menuitem "Adjust teams" [ showmenu "Team adjustment" ] menuitem "Change mastermode" "showmenu Mastermode" -menuitem "Change settings" "showmenu settings" menuitem "Demos" "showmenu demo" -menuitem "Chat" "saycommand" -menuitem "Team Chat" "saycommand %" -menuitem "Voice Coms" "showmenu voicecom" -menuitem "Disconnect" "disconnect" menuitem "" -menuitem "Go to the main menu" "showmenu main" +menuitem "Disconnect" "disconnect" +menuitem " 2Go back to Main Menu" "showmenu main" -// Multiplayer menu only used when disconnected. +// Multiplayer menu only used when disconnected + newmenu multiplayer menuitem "Join a server" "searchlan 1; showallservers 1; updatefrommaster; showmenu server" menuitem "Join a LAN server" "searchlan 2; showallservers 0; showmenu server" menuitem "Custom connect" [ showmenu "Custom connect" ] -menuitem "Force servers to update" "updatefrommaster 1" +menuitem "Force serverlist update" "updatefrommaster 1" newmenu "Custom connect" @@ -31,7 +33,7 @@ menuitemtextinput "Server IP/DNS: " "" "alias cc1 $arg1" menuitemtextinput "Server port (optional): " "" "alias cc2 $arg1" menuitemtextinput "Server password (optional): " "" "alias cc3 $arg1" menuitem "" -menuitem " [ OK ] " "connect $cc1 $cc2 $cc3" +menuitem " 2 [ Connect ] " "connect $cc1 $cc2 $cc3" newmenu kick/ban diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 6202c4e7..22318339 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -1,8 +1,18 @@ newmenu Crosshairs menudirlist "packages/misc/crosshairs" "png" "loadcrosshair (concatword $arg1 .png)" +newmenu Name -newmenu weapons +menuitemtextinput "Nickname:" "result $curname" "name $arg1" + + +newmenu Team + +menuitemslider "Team: " 0 1 "(curteam)" 1 "CLA RVSF" "alias newteam $arg1" +menuitem " 2 [ Apply ] " [ team (at [CLA RVSF] $newteam) ] + + +newmenu Weapons menumdl weapons/assault/menu mapmodel 75 12 menuitem "MTP-57 Assault Rifle" "nextprimary 5;echo MTP-57 Assault Rifle chosen" "chmenumdl weapons weapons/assault/menu mapmodel 75 12" @@ -34,21 +44,13 @@ menuitem "Police" "skin 5" "chmenumdl RVSF playermodels/RVSF/06 all 50 newmenu settings menuinit [alias newteam (curteam)] -menuitemtextinput "Nickname:" "result $curname" "name $arg1" -menuitemslider "Team: " 0 1 "(curteam)" 1 "CLA RVSF" "alias newteam $arg1" +menuitem "Video settings" "showmenu video" +menuitem "Head-Up display settings" "showmenu HUD" +menuitem "Input controls" "showmenu controls" +menuitem "Sound settings" "showmenu sound" +menuitem "Misc settings" "showmenu Misc" menuitem "" "" -menuitem "Change player skin.." [showmenu (at [CLA RVSF] (curteam))] -menuitem "Change weapon.." "showmenu weapons" -menuitem "" "" -menuitem "Video settings..." "showmenu video" -menuitem "Head-Up display settings..." "showmenu HUD" -menuitem "Input controls..." "showmenu controls" -menuitem "Sound settings..." "showmenu sound" -menuitem "Misc settings..." "showmenu Misc" -menuitem "" "" -menuitem "Reset all settings..." [ showmenu "Reset ALL settings?" ] -menuitem "" -menuitem " [ OK ] " [ team (at [CLA RVSF] $newteam) ] +menuitem "Reset all settings" [ showmenu "Reset ALL settings?" ] newmenu "QUICK setup" @@ -59,7 +61,7 @@ menuitemslider "Mouse sensitivity: " 2 150 "($sensitivity)" 2 "" "sensitivity $a menuitemslider "Graphics detail: " 1 4 "(getgfxq)" 1 "low medium good best" "new_gfx_quality $arg1" menuitemslider "Sound detail: " 1 3 "(getsoundq)" 1 "low medium high" "new_sound_quality $arg1" menuitem "" "" -menuitem " [ OK ] " "resetgl" +menuitem " 2 [ OK ] " "resetgl" alias getgfxq [ if (= $minlod 200) [ result 4 ] [ @@ -193,7 +195,7 @@ menuitemkeyinput "Special action: " altaction menuitemkeyinput "Jump: " jump menuitemkeyinput "Crouch: " crouch menuitemkeyinput "Reload: " reload -menuitemkeyinput "Weapon menu: " "showmenu weapons" +menuitemkeyinput "Weapon menu: " "showmenu Weapons" menuitemkeyinput "Next weapon: " "universaldelta 1" menuitemkeyinput "Previous weapon: " "universaldelta -1" menuitemkeyinput "Show scores: " showscores @@ -236,7 +238,7 @@ menuitem "" "" menuitem "Advanced video settings..." [ showmenu "Advanced video settings" ] menuitem "" "" -menuitem " [ Apply now! ] " resetgl +menuitem " 2 [ Apply now! ] " resetgl newmenu "Advanced video settings" @@ -287,7 +289,7 @@ menuitem "FPS range..." "showmenu fpsrange" menuitem "" "" -menuitem " [ Apply now! ] " resetgl +menuitem " 2 [ Apply now! ] " resetgl newmenu fpsrange