From 532e21b81d5c22760da688fd307f2795859f06ff Mon Sep 17 00:00:00 2001 From: Bukz Date: Sun, 10 Apr 2011 21:26:39 +0000 Subject: [PATCH] temp fixes/updates git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6237 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/dyngamma.cfg | 8 ++------ config/menus_settings.cfg | 36 +++++++++++++++++++----------------- config/scripts.cfg | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/config/dyngamma.cfg b/config/dyngamma.cfg index 345e43b6..7437535d 100644 --- a/config/dyngamma.cfg +++ b/config/dyngamma.cfg @@ -22,12 +22,8 @@ setgamma = [ ] ] echo (c 1)Note: (c 5) $arg1 has been set as your default gamma for (c 2) (curmap 1) - ] [ - echo (c 3)Error: (c 5)You are not on a official map! - ] - ] [ - echo (c 3)Error: (c 5)gamma has a minimum value of 30 and maximum value of 300! - ] + ] [ echo (c 3)Error: (c 5)You are not on a official map! ] + ] [ echo (c 3)Error: (c 5)gamma has a minimum value of 30 and maximum value of 300! ] ] // Plugin to mapstartalways on every run if it doesn't already exist. diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 8e5c9527..570347b1 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -378,7 +378,7 @@ menuitemcheckbox "Show scores on death: " "$showscoresondeath" [ showscoresondea menuitem "Change to the enemy team" [ changeteam ] menuitem "Change weapon..." [ showmenu Weapons ] menuitem "Change player skin..." [ showmenu (at [CLA RVSF] (curteam)) ] -menuitem "Edit kill messages" [ showmenu "Kill Messages" ] +// menuitem "Edit kill messages" [ showmenu "Kill Messages" ] // Uncomment when kill messages are ready. (written to saved.cfg) menuitemslider "Akimbo end action: " 0 2 "$akimboendaction" 1 [ "Switch to pistol" "Switch to primary weapon" "Switch to grenades" ] [ akimboendaction $arg1 ] __fontsetting = 0 // Initial setting for status of fonts so AC doesn't give errors. @@ -588,19 +588,21 @@ menuitemcheckbox "Awesome (1): " "(soundmuted 97)" [ mutesound 97 (! menuitemcheckbox "Awesome (2): " "(soundmuted 98)" [ mutesound 98 (! $arg1) ] // The kill messages must be written to saved.cfg before the menu below will really become of any use. -newmenu "Kill Messages" -menuitemvar [concat (c 9)Frag messages: ] [] [] -menuitemtextinput [Pistol: ] [fragmessage 1] [fragmessage 1 $arg1] [] 256 -menuitemtextinput [Carbine: ] [fragmessage 2] [fragmessage 2 $arg1] [] 256 -menuitemtextinput [Shotgun: ] [fragmessage 3] [fragmessage 3 $arg1] [] 256 -menuitemtextinput [SMG: ] [fragmessage 4] [fragmessage 4 $arg1] [] 256 -menuitemtextinput [Sniper: ] [fragmessage 5] [fragmessage 5 $arg1] [] 256 -menuitemtextinput [AR: ] [fragmessage 6] [fragmessage 6 $arg1] [] 256 -menuitemtextinput [CPistol: ] [fragmessage 7] [fragmessage 7 $arg1] [] 256 -menuitemtextinput [Akimbo: ] [fragmessage 9] [fragmessage 9 $arg1] [] 256 -menuitem [] -1 -menuitemvar [concat (c 9)Gib messages: ] [] [] -menuitemtextinput [Knife: ] [gibmessage 0] [gibmessage 0 $arg1] [] 256 -menuitemtextinput [Shotgun: ] [gibmessage 3] [gibmessage 3 $arg1] [] 256 -menuitemtextinput [Sniper: ] [gibmessage 5] [gibmessage 5 $arg1] [] 256 -menuitemtextinput [Grenades: ] [gibmessage 8] [gibmessage 8 $arg1] [] 256 \ No newline at end of file +// Uncomment when the kill messages are ready. (assuming no further editing is necessary) +// newmenu "Kill Messages" +// menuitemvar [concat (c 9)Frag messages: ] [] [] +// menuitemtextinput [Pistol: ] [fragmessage 1] [ fragmessage 1 $arg1 ] [] 256 +// menuitemtextinput [Carbine: ] [fragmessage 2] [ fragmessage 2 $arg1 ] [] 256 +// menuitemtextinput [Shotgun: ] [fragmessage 3] [ fragmessage 3 $arg1 ] [] 256 +// menuitemtextinput [SMG: ] [fragmessage 4] [ fragmessage 4 $arg1 ] [] 256 +// menuitemtextinput [Sniper: ] [fragmessage 5] [ fragmessage 5 $arg1 ] [] 256 +// menuitemtextinput [AR: ] [fragmessage 6] [ fragmessage 6 $arg1 ] [] 256 +// menuitemtextinput [CPistol: ] [fragmessage 7] [ fragmessage 7 $arg1 ] [] 256 +// menuitemtextinput [Akimbo: ] [fragmessage 9] [ fragmessage 9 $arg1 ] [] 256 +// menuitem [] -1 +// menuitemvar [concat (c 9)Gib messages: ] [] [] +// menuitemtextinput [Knife: ] [gibmessage 0] [ gibmessage 0 $arg1 ] [] 256 +// menuitemtextinput [Shotgun: ] [gibmessage 3] [ gibmessage 3 $arg1 ] [] 256 +// menuitemtextinput [Sniper: ] [gibmessage 5] [ gibmessage 5 $arg1 ] [] 256 +// menuitemtextinput [Grenades: ] [gibmessage 8] [ gibmessage 8 $arg1 ] [] 256 + diff --git a/config/scripts.cfg b/config/scripts.cfg index e2e5880f..19eddb47 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -328,7 +328,7 @@ gencl = [ if (|| (! (= $selx 0)) (! (= $sely 0))) [ echo (c 3)Trying colored light: (c 5) $arg1 (at $tmp_cl 0) (at $tmp_cl 1) (at $tmp_cl 2) newent light $arg1 (at $tmp_cl 0) (at $tmp_cl 1) (at $tmp_cl 2) - ] [ echo (c 3)Error: (c 5)If an argument is given for (concatword (c 1) gencl (c 5) ",") you must select a cube where you want the new light to be placed. ] + ] [ echo (c 3)Error: (c 5)If an argument "(radius)" is given for (concatword (c 1) gencl (c 5) ",") you must select a cube first. ] ] [ if (strcmp (getenttype) light) [ echo (c 3)Trying colored light: (c 5) (getentattr 0) (at $tmp_cl 0) (at $tmp_cl 1) (at $tmp_cl 2)