changeset 351:58e7f22a496b

Optimizations, minor bugfixes.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 10 Mar 2006 22:17:36 +0000
parents 43f28b64c8b5
children 5629287d2ae7
files ggrtf-pplacer.tf ggrtf-pssmangle.tf
diffstat 2 files changed, 10 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-pplacer.tf	Fri Mar 10 22:00:20 2006 +0000
+++ b/ggrtf-pplacer.tf	Fri Mar 10 22:17:36 2006 +0000
@@ -17,7 +17,7 @@
 		/let _ccol=3%;\
 		/while (_ccol>0) \
 			/let _gps=%{_crow}_%{_ccol}%;\
-			/eval /set gtestpos=$$[replace(" ","",gparty_%{_gps}_s)]%;\
+			/eval /set gtestpos=$$[gparty_%{_gps}_s]%;\
 			/if (gtestpos=~{1}) \
 				/return _gps%;\
 			/endif%;\
@@ -47,8 +47,8 @@
 		/let _ccol=3%;\
 		/while (_ccol>0) \
 			/let _gps=%{_crow}_%{_ccol}%;\
-			/eval /set gcurpos=$$[replace(" ","",gparty_%{_gps}_s)]%;\
-			/eval /set gwantpos=$$[replace(" ","",gparty_%{_gps}_fs)]%;\
+			/eval /set gcurpos=$$[gparty_%{_gps}_s]%;\
+			/eval /set gwantpos=$$[gparty_%{_gps}_fs]%;\
 			/if (gcurpos!~gwantpos) \
 				/if (gcurpos!~"" & gwantpos!~"") \
 					@@party swap %{gcurpos} %{gwantpos}%;\
--- a/ggrtf-pssmangle.tf	Fri Mar 10 22:00:20 2006 +0000
+++ b/ggrtf-pssmangle.tf	Fri Mar 10 22:17:36 2006 +0000
@@ -60,7 +60,7 @@
 	/eval /set gparty_%{_gps}_ospm=$$[gparty_%{_gps}_spm]%;\
 	/eval /set gparty_%{_gps}_oep=$$[gparty_%{_gps}_ep]%;\
 	/eval /set gparty_%{_gps}_oepm=$$[gparty_%{_gps}_epm]%;\
-	/set gparty_%{_gps}_s=%{2}%;\
+	/set gparty_%{_gps}_s=$[replace(" ","",{2})]%;\
 	/set gparty_%{_gps}_pl=%{3}%;\
 	/set gparty_%{_gps}_hp=%{4}%;\
 	/set gparty_%{_gps}_hpm=%{5}%;\
@@ -76,28 +76,19 @@
 			/gparty_set %%%{_crow}.%%%{_ccol}
 
 
-/def -i -F -p9999 -msimple -t',-----------------------------------------------------------------------------.' pss_getbegin =\
-	/if (gparty_gag)\
-		/substitute -ag%;\
-		/gparty_clear%;\
-	/endif
+/def -i -F -Egparty_gag -ag -p9999 -msimple -t',-----------------------------------------------------------------------------.' pss_getbegin =\
+	/gparty_clear
 
 
-/def -i -F -p9999 -mregexp -t"^\|.([1-3?].[1-3?])   ([A-Z][a-z ][a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z]?) +(ld|ldr|fol|mbr|form|unc|dead|rest|stun) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\)" pss_getps =\
+/def -i -F -Egparty_gag -ag -p9999 -mregexp -t"^\|.([1-3?]\.[1-3?])   ([A-Z][a-z ][a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z ]?[a-z]?) +(ld|ldr|fol|mbr|form|unc|dead|rest|stun) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\) +([0-9-]+)\( *([0-9-]+)\)" pss_getps =\
 	/if ({P1} !~ "?.?")\
 		/test gparty_set({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8},{P9})%;\
 	/endif%;\
-	/if (gparty_gag)\
-		/substitute -ag%;\
-	/endif
 
 
-/def -i -F -p9999 -msimple -t'`-----------------------------------------------------------------------------\'' pss_getend =\
-	/if (gparty_gag)\
-		/substitute -ag%;\
-		/set gparty_gag=0%;\
-		/gparty_show1%;\
-	/endif%;\
+/def -i -F -Egparty_gag -ag -p9999 -msimple -t'`-----------------------------------------------------------------------------\'' pss_getend =\
+	/set gparty_gag=0%;\
+	/gparty_show1%;\
 	/if (gparty_save)\
 		/set gparty_save=0%;\
 		/for _ccol 1 3 \