From bebae41a0c7307569a22303ec8b5363085644e4f Mon Sep 17 00:00:00 2001 From: Bukz Date: Thu, 23 Aug 2012 23:51:13 +0000 Subject: [PATCH] cleanups git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6861 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus.cfg | 2 +- config/menus_settings.cfg | 2 +- config/scripts.cfg | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config/menus.cfg b/config/menus.cfg index d8811fa0..82c7c69c 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -107,7 +107,7 @@ newmenu help menuitem "AssaultCube reference" [ showmenu reference ] menuitem "Search the reference" [ showmenu "Reference search" ] menuitem "Keyboard controls" [ showmenu controls ] -menuitem "Demo tutorial" [ tutstart 1 ] +// menuitem "Demo tutorial" [ tutstart 1 ] // TODO: Fix old demo tutorial or record a new one. menuitem "View the FAQ" [ showmenu faq ] menuitem "" -1 menuitem "...for further information/help see the README" [ echo (yellow)The readme can be found in the base AssaultCube directory. ] diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 2f90a7fc..7558a1c5 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -53,7 +53,7 @@ menuitemslider "Graphics detail: " 1 6 "$gfxqualityalias" 1 [ Horrible Low Mediu menuitemslider "Sound detail: " 1 3 "$soundqualityalias" 1 "Low Medium High" [ new_sound_quality $arg1 ] menuitemslider "Field of view: " 75 120 "$fov" 2 "" [ fov $arg1 ] menuitem "" -1 -menuitem " 0 [ OK; View Tutorial ]" [ closemenu "QUICK setup"; resetgl; showmenu "Confirm tutorial" ] +// menuitem " 0 [ OK; View Tutorial ]" [ closemenu "QUICK setup"; resetgl; showmenu "Confirm tutorial" ] // TODO: Fix old demo tutorial or record a new one. menuitem " 0 [ OK; View FAQ ]" [ closemenu "QUICK setup"; resetgl; showmenu faq ] menuitem " 2 [ OK ]" [ closemenu "QUICK setup"; resetgl ] diff --git a/config/scripts.cfg b/config/scripts.cfg index 0ed01853..aa945a17 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -373,11 +373,9 @@ const convertcase [ ] ingall = 0 - -const ignoreall [ if $connected [ ingall = 1; loop ia 21 [ ignore $ia ]; echo (blue)NOTE: (white)All clients currently on the server were ignored. ] ] -const unignoreall [ if $connected [ ingall = 0; clearignored; echo (blue)NOTE: (white)All clients currently on the server were unignored. ] ] - -const ignoreteam [ +const ignoreall [ if $connected [ ingall = 1; loop ia 21 [ ignore $ia ]; echo (blue)NOTE: (white)All clients currently on the server were ignored. ] ] +const unignoreall [ if $connected [ ingall = 0; clearignored; echo (blue)NOTE: (white)All clients currently on the server were unignored. ] ] +const ignoreteam [ if (curmodeattr team) [ _arg1 = (toupper $arg1) if (|| (strcmp $_arg1 CLA) (strcmp $_arg1 RVSF)) [ @@ -397,7 +395,6 @@ const ignoreteam [ ] ] [ echo (red)Error: (white)Not in a team mode. ] ] - const ignoreenemy [ ignoreteam (at "0 1" (! (player1 team))) ] // Simple claim-admin script for one single-server.