Start some basic code cleanup in Bench using some SSTNPL macros.

SBTCVM · Aug 14, 2021 · 62c602e · 62c602e
1 parent 3f3b6fc
commit 62c602e
Show file tree

Hide file tree

Showing 11 changed files with 1,818 additions and 1,511 deletions.
diff --git a/apps/bench/auto_bench.tdsk1 b/apps/bench/auto_bench.tdsk1
diff --git a/apps/bench/auto_xas.xas b/apps/bench/auto_xas.xas
@@ -6,6 +6,7 @@ stnp --module bench/lib/ui.stnp
 stnp --module bench/lib/yn_dialog.stnp
 
 stnp --module bench/lib/sndkern_lib.stnp
+stnp --module bench/lib/bench_lib.stnp
 
 xas bench/bench/bench.xas
 

diff --git a/apps/bench/bench/desktop2.stnp b/apps/bench/bench/desktop2.stnp
@@ -66,29 +66,19 @@ loop
 
 	end
 end
-
-
-
-
 label info
-	prline Starting info.app...
 	gsub backup_self
-	vdi rstld -1 info.app
-	prline ERROR! info.app not found!
+	!b_lib.app_run(info.app)
 return
 
 label dos
-	prline Starting dos.app...
 	gsub backup_self
-	vdi rstld -1 dos.app
-	prline ERROR! dos.app not found!
+	!b_lib.app_run(dos.app)
 return
 
 label credits
-	prline Starting credits.app...
 	gsub backup_self
-	vdi rstld -1 credits.app
-	prline ERROR! credits.app not found!
+	!b_lib.app_run(credits.app)
 return
 
 
@@ -139,6 +129,7 @@ include bench/lib/common as common
 include bench/lib/ui as ui
 include plrle_noalpha as pl
 include bench/lib/sndkern_lib as sklib
+include bench/lib/bench_lib as b_lib
 asm include;bench/media/info.tas0;ICON_info
 asm include;bench/media/dos.tas0;ICON_dos
 asm include;bench/media/credits_icn.tas0;ICON_credits
diff --git a/apps/bench/bench/desktop2.trom b/apps/bench/bench/desktop2.trom