From 729ad520a82bb17fd8a4b82f9b024275c1fa5783 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 12 Dec 2014 13:24:22 -0800
Subject: [PATCH] fix for space-invaders changes.

---
 extra/balloon-bomber/balloon-bomber.factor | 15 ++++++++-------
 extra/lunar-rescue/lunar-rescue.factor     | 17 +++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/extra/balloon-bomber/balloon-bomber.factor b/extra/balloon-bomber/balloon-bomber.factor
index e5bd6ba4a1..47683f1836 100644
--- a/extra/balloon-bomber/balloon-bomber.factor
+++ b/extra/balloon-bomber/balloon-bomber.factor
@@ -3,12 +3,8 @@
 !
 ! Balloon Bomber: http://www.mameworld.net/maws/romset/ballbomb
 !
-USING: 
-    cpu.8080
-    kernel 
-    space-invaders
-    ui 
-;
+USING: accessors cpu.8080 cpu.8080.emulator kernel
+space-invaders ui ;
 IN: balloon-bomber
 
 TUPLE: balloon-bomber < space-invaders ; 
@@ -25,6 +21,11 @@ CONSTANT: rom-info {
 }
 
 : run-balloon ( -- )
-    [ "Balloon Bomber" <balloon-bomber>  rom-info (run) ] with-ui ;
+    [
+        <balloon-bomber>
+        rom-info over load-rom*
+        <invaders-gadget> t >>windowed?
+        "Balloon Bomber" open-window
+    ] with-ui ;
 
 MAIN: run-balloon
diff --git a/extra/lunar-rescue/lunar-rescue.factor b/extra/lunar-rescue/lunar-rescue.factor
index 6cd0cf3499..68a737cf30 100644
--- a/extra/lunar-rescue/lunar-rescue.factor
+++ b/extra/lunar-rescue/lunar-rescue.factor
@@ -3,12 +3,8 @@
 !
 ! Lunar Rescue: http://www.mameworld.net/maws/romset/lrescue
 !
-USING: 
-    cpu.8080
-    kernel 
-    space-invaders
-    ui 
-;
+USING: accessors cpu.8080 cpu.8080.emulator kernel
+space-invaders ui ;
 IN: lunar-rescue
 
 TUPLE: lunar-rescue < space-invaders ; 
@@ -25,7 +21,12 @@ CONSTANT: rom-info {
     { 0x4800 "lrescue/lrescue.6" }
 }
 
-: run-lunar ( -- )  
-    [ "Lunar Rescue" <lunar-rescue>  rom-info (run) ] with-ui ;
+: run-lunar ( -- )
+    [
+        <lunar-rescue>
+        rom-info over load-rom*
+        <invaders-gadget> t >>windowed?
+        "Lunar Rescue" open-window
+    ] with-ui ;
 
 MAIN: run-lunar