steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

space-invaders: add back run-rom for code reuse.

db4
John Benediktsson 2014-12-12 14:01:13 -08:00
parent 729ad520a8
commit f562bc3385
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/balloon-bomber/balloon-bomber.factor
View File

@ -3,11 +3,10 @@
! !
! Balloon Bomber: http://www.mameworld.net/maws/romset/ballbomb ! Balloon Bomber: http://www.mameworld.net/maws/romset/ballbomb
! !
USING: accessors cpu.8080 cpu.8080.emulator kernel USING: kernel space-invaders ui ;
space-invaders ui ;
IN: balloon-bomber IN: balloon-bomber
TUPLE: balloon-bomber < space-invaders ; TUPLE: balloon-bomber < space-invaders ;
: <balloon-bomber> ( -- cpu ) : <balloon-bomber> ( -- cpu )
balloon-bomber new cpu-init ; balloon-bomber new cpu-init ;
@ -22,10 +21,7 @@ CONSTANT: rom-info {
: run-balloon ( -- ) : run-balloon ( -- )
[ [
<balloon-bomber> "Ballon Bomber" <balloon-bomber> rom-info run-rom
rom-info over load-rom*
<invaders-gadget> t >>windowed?
"Balloon Bomber" open-window
] with-ui ; ] with-ui ;
MAIN: run-balloon MAIN: run-balloon

10
extra/lunar-rescue/lunar-rescue.factor
View File

@ -3,11 +3,10 @@
! !
! Lunar Rescue: http://www.mameworld.net/maws/romset/lrescue ! Lunar Rescue: http://www.mameworld.net/maws/romset/lrescue
! !
USING: accessors cpu.8080 cpu.8080.emulator kernel USING: kernel space-invaders ui ;
space-invaders ui ;
IN: lunar-rescue IN: lunar-rescue
TUPLE: lunar-rescue < space-invaders ; TUPLE: lunar-rescue < space-invaders ;
: <lunar-rescue> ( -- cpu ) : <lunar-rescue> ( -- cpu )
lunar-rescue new cpu-init ; lunar-rescue new cpu-init ;
@ -23,10 +22,7 @@ CONSTANT: rom-info {
: run-lunar ( -- ) : run-lunar ( -- )
[ [
<lunar-rescue> "Lunar Rescue" <lunar-rescue> rom-info run-rom
rom-info over load-rom*
<invaders-gadget> t >>windowed?
"Lunar Rescue" open-window
] with-ui ; ] with-ui ;
MAIN: run-lunar MAIN: run-lunar

8
extra/space-invaders/space-invaders.factor
View File

@ -358,6 +358,9 @@ M: invaders-gadget graft*
M: invaders-gadget ungraft* M: invaders-gadget ungraft*
t swap quit?<< ; t swap quit?<< ;
: run-rom ( title cpu rom-info -- )
over load-rom* <invaders-gadget> t >>windowed? swap open-window ;
CONSTANT: rom-info { CONSTANT: rom-info {
{ 0x0000 "invaders/invaders.h" } { 0x0000 "invaders/invaders.h" }
{ 0x0800 "invaders/invaders.g" } { 0x0800 "invaders/invaders.g" }
@ -367,10 +370,7 @@ CONSTANT: rom-info {
: run-invaders ( -- ) : run-invaders ( -- )
[ [
<space-invaders> "Space Invaders" <space-invaders> rom-info run-rom
rom-info over load-rom*
<invaders-gadget> t >>windowed?
"Space Invaders" open-window
] with-ui ; ] with-ui ;
MAIN: run-invaders MAIN: run-invaders