From 3696db3608bcdc4706c8a8a7d850cf08929b0839 Mon Sep 17 00:00:00 2001
From: RandumKiwi <RandumKiwi@users.noreply.github.com>
Date: Wed, 6 Feb 2008 10:52:25 +0000
Subject: [PATCH] Screenshot bug fix, plus a few other things...

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1604 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/defaults.cfg |  4 ++--
 config/keymap.cfg   |  4 ++--
 config/lights.cfg   | 14 +++-----------
 config/menus.cfg    |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/config/defaults.cfg b/config/defaults.cfg
index 6345b7ec..e9b28a94 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -22,7 +22,7 @@ bind B "showmenu weapons"
 alias primary [ weapon (currentprimary) ]
 alias secondary [ weapon 1 ]
 alias melee [ weapon 0 ]
-alias grenades [weapon 6 ]
+alias grenades [ weapon 6 ]
 
 bind 1 primary
 bind 2 secondary
@@ -73,7 +73,7 @@ alias zoom [
 ]
 
 //bind MOUSE2 [ zoom 1; onrelease [ zoom 0 ] ]
-bind MOUSE2 [ if $editing [ showmenu "editing" ] [ altaction ] ]
+bind MOUSE2 [ if $editing [ showmenu editing ] [ altaction ] ]
 
 // alternative zoom toggle
 //alias ztoggle 0
diff --git a/config/keymap.cfg b/config/keymap.cfg
index a168f5c7..f3a46c2a 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -60,7 +60,7 @@ keymap 104 H "heightfield 0"
 keymap 105 I "heightfield 2"
 keymap 106 J ""
 keymap 107 K "corner"
-keymap 108 L [ showmenu lighting ]
+keymap 108 L [ if $editing [ showmenu lighting ] ]
 keymap 109 M ""
 keymap 110 N ""
 keymap 111 O "editheight 2 -1"
@@ -113,7 +113,7 @@ keymap 289 F8 "followplayer 1"
 keymap 290 F9 ""
 keymap 291 F10 ""
 keymap 292 F11 "toggleconsole"
-keymap 293 F12 "[ screenshot; sleep 3 [ echo "screenshot created" ] ]"
+keymap 293 F12 [ screenshot; sleep 3 [ echo "screenshot created" ] ]
 keymap 294 F13 ""
 keymap 295 F14 ""
 keymap 296 F15 ""
diff --git a/config/lights.cfg b/config/lights.cfg
index 8a0ea0e4..b14886b6 100644
--- a/config/lights.cfg
+++ b/config/lights.cfg
@@ -14,6 +14,8 @@ menuitem "Green light"	[ showmenu "Green light radius" ]
 menuitem "Teal light"	[ showmenu "Teal light radius" ]
 menuitem "Blue light"	[ showmenu "Blue light radius" ]
 menuitem "Pink light"	[ showmenu "Pink light radius" ]
+menuitem ""
+menuitem "Custom light"	"saycommand /newent light "
 
 
 // Light radiuses
@@ -778,14 +780,4 @@ menuitem "Brightness of 200"		"newent light 16 200 200 1"
 menuitem "Brightness of 225"		"newent light 16 225 225 1"
 menuitem "Brightness of 255(Max)"	"newent light 16 255 255 1"
 
-// End of yellow lights.
-
-
-
-
-
-
-
-
-
-
+// End of yellow lights.
\ No newline at end of file
diff --git a/config/menus.cfg b/config/menus.cfg
index e712c276..5218b3a0 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -220,10 +220,10 @@ menuitem "Private" "mastermode 1"
 
 newmenu editing
 
+menuitem "Mapmodels..."				"showmenu mapmodels"
 menuitem "Lighting..."				"showmenu lighting"
 menuitem "Entities"			        "showmenu entities"
 menuitem "Pickups"                              "showmenu pickups"
-menuitem "Mapmodels..."				"showmenu mapmodels"
 menuitem "Arches and slopes.."                  "showmenu arches"
 menuitem "Map operations.."                     "showmenu mapop"
 menuitem "Bots"                                 "showmenu botedit"