From dfebf824512897bec69a98965d2858ae9ce17f70 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Sun, 31 Aug 2008 18:24:55 +0000
Subject: [PATCH] better prevweapon tracking for grenade switch

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2461 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/defaults.cfg | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/config/defaults.cfg b/config/defaults.cfg
index 62e562fd..9a0dce54 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -22,12 +22,11 @@ alias altaction [
 ]
 
 alias quicknadethrow [ 
-	alias prevweapon (curweapon)
 	if (> (magcontent 6) 0) [
-		grenades
+        if (!= (curweapon) 6) [grenades]
 		attack
-	] []
-	onrelease [ sleep 1 [ weapon $prevweapon ] ]
+    ]
+	onrelease [ sleep 1 [ if (= (curweapon) 6) [weapon (prevweapon)] ] ]
 ]
 
 loop i 8 [ alias (concatword altaction_ $i) quicknadethrow ] // quick nade throw is default