use radix literals

[factor.git] / extra / balloon-bomber / balloon-bomber.factor

diff --git a/extra/balloon-bomber/balloon-bomber.factor b/extra/balloon-bomber/balloon-bomber.factor
index 160447dc797fa58fc5b122f3a6b6e1131cf880db..0e079e79f07f0e3b220144de62b3f1e878db5b9f 100644 (file)
--- a/extra/balloon-bomber/balloon-bomber.factor
+++ b/extra/balloon-bomber/balloon-bomber.factor
@@ -3,21 +3,28 @@
 !\r
 ! Balloon Bomber: http://www.mameworld.net/maws/romset/ballbomb\r
 !\r
-USING: kernel space-invaders cpu.8080 ui ;\r
+USING: \r
+    cpu.8080\r
+    kernel \r
+    space-invaders\r
+    ui \r
+;\r
 IN: balloon-bomber\r
 \r
-TUPLE: balloon-bomber ; \r
+TUPLE: balloon-bomber < space-invaders ; \r
 \r
 : <balloon-bomber> ( -- cpu )\r
-  <space-invaders> balloon-bomber construct-delegate ;\r
+  balloon-bomber new cpu-init ;\r
 \r
-: run ( -- )  \r
-  "Balloon Bomber" <balloon-bomber> {\r
-    { HEX: 0000 "ballbomb/tn01" }\r
-    { HEX: 0800 "ballbomb/tn02" }\r
-    { HEX: 1000 "ballbomb/tn03" }\r
-    { HEX: 1800 "ballbomb/tn04" }\r
-    { HEX: 4000 "ballbomb/tn05-1" }\r
-  } [ (run) ] with-ui ;\r
+CONSTANT: rom-info {\r
+    { 0x0000 "ballbomb/tn01" }\r
+    { 0x0800 "ballbomb/tn02" }\r
+    { 0x1000 "ballbomb/tn03" }\r
+    { 0x1800 "ballbomb/tn04" }\r
+    { 0x4000 "ballbomb/tn05-1" }\r
+  }\r
 \r
-MAIN: run\r
+: run-balloon ( -- )  \r
+  [ "Balloon Bomber" <balloon-bomber>  rom-info (run) ] with-ui ;\r
+\r
+MAIN: run-balloon\r