diff --git a/extra/balloon-bomber/balloon-bomber.factor b/extra/balloon-bomber/balloon-bomber.factor index 47683f1836..7cd77a0950 100644 --- a/extra/balloon-bomber/balloon-bomber.factor +++ b/extra/balloon-bomber/balloon-bomber.factor @@ -3,11 +3,10 @@ ! ! Balloon Bomber: http://www.mameworld.net/maws/romset/ballbomb ! -USING: accessors cpu.8080 cpu.8080.emulator kernel -space-invaders ui ; +USING: kernel space-invaders ui ; IN: balloon-bomber -TUPLE: balloon-bomber < space-invaders ; +TUPLE: balloon-bomber < space-invaders ; : ( -- cpu ) balloon-bomber new cpu-init ; @@ -22,10 +21,7 @@ CONSTANT: rom-info { : run-balloon ( -- ) [ - - rom-info over load-rom* - t >>windowed? - "Balloon Bomber" open-window + "Ballon Bomber" rom-info run-rom ] with-ui ; MAIN: run-balloon diff --git a/extra/lunar-rescue/lunar-rescue.factor b/extra/lunar-rescue/lunar-rescue.factor index 68a737cf30..9ec0f77ffd 100644 --- a/extra/lunar-rescue/lunar-rescue.factor +++ b/extra/lunar-rescue/lunar-rescue.factor @@ -3,11 +3,10 @@ ! ! Lunar Rescue: http://www.mameworld.net/maws/romset/lrescue ! -USING: accessors cpu.8080 cpu.8080.emulator kernel -space-invaders ui ; +USING: kernel space-invaders ui ; IN: lunar-rescue -TUPLE: lunar-rescue < space-invaders ; +TUPLE: lunar-rescue < space-invaders ; : ( -- cpu ) lunar-rescue new cpu-init ; @@ -23,10 +22,7 @@ CONSTANT: rom-info { : run-lunar ( -- ) [ - - rom-info over load-rom* - t >>windowed? - "Lunar Rescue" open-window + "Lunar Rescue" rom-info run-rom ] with-ui ; MAIN: run-lunar diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor index 96f82ea445..ef10579cf7 100755 --- a/extra/space-invaders/space-invaders.factor +++ b/extra/space-invaders/space-invaders.factor @@ -358,6 +358,9 @@ M: invaders-gadget graft* M: invaders-gadget ungraft* t swap quit?<< ; +: run-rom ( title cpu rom-info -- ) + over load-rom* t >>windowed? swap open-window ; + CONSTANT: rom-info { { 0x0000 "invaders/invaders.h" } { 0x0800 "invaders/invaders.g" } @@ -367,10 +370,7 @@ CONSTANT: rom-info { : run-invaders ( -- ) [ - - rom-info over load-rom* - t >>windowed? - "Space Invaders" open-window + "Space Invaders" rom-info run-rom ] with-ui ; MAIN: run-invaders