Mercurial > hg > batmud > ggrtf

changeset 1373:424d6a3f14f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reset alch_testing flag when there is an error in /mix macro arguments.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 27 Mar 2011 01:17:35 +0200
parents 71d077d39236
children 191114d8a356
files gm-alchemist.tf
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gm-alchemist.tf	Sat Mar 26 20:05:46 2011 +0200
+++ b/gm-alchemist.tf	Sun Mar 27 01:17:35 2011 +0200
@@ -116,7 +116,10 @@
 		/msq Invalid herb/plant '%{alch_herb}'.%;\
 		/let _error=1%;\
 	/endif%;\
-	/if (_error) /break%;/endif%;\
+	/if (_error)\
+		/set alch_testing=0%;\
+		/break%;\
+	/endif%;\
 	/set alch_can=$(/galch_get_item %{alch_organ} %{galch_cans})%;\
 	/if (alch_can=~"")\
 		/msq No matching can for organ '%{alch_organ}'.%;\
@@ -127,7 +130,10 @@
 		/msq No matching jar for herb '%{alch_herb}'.%;\
 		/let _error=1%;\
 	/endif%;\
-	/if (_error) /break%;/endif%;\
+	/if (_error)\
+		/set alch_testing=0%;\
+		/break%;\
+	/endif%;\
 	/set alch_st=1%;\
 	/let _herb=$[replace("_"," ", alch_herb)]%;\
 	@@get %{_herb} from %{alch_jar}%;\