@@ 122,7 122,7 @@ BRK
@on-mouse-menu ( -> )
- ;draw-cursor JSR2
+ #42 .Mouse/state DEI #00 ! + ;draw-cursor JSR2
.Mouse/y DEI2 .frame/y LDZ2 -- 8// NIP #11 ! ,&skip JCN
.Mouse/x DEI2 .frame/x LDZ2 -- 8// NIP
@@ 217,10 217,7 @@ RTN
.table/timer LDZ #00 = ,&no-timer JCN
.table/timer LDZ #01 - [ DUP ] .table/timer STZ
( blink cursor )
- .cursor/x LDZ2 .Screen/x DEO2
- .cursor/y LDZ2 .Screen/y DEO2
- ;pointer-icn .Screen/addr DEO2
- #41 .table/timer LDZ #02 AND + .Screen/sprite DEO
+ #41 .table/timer LDZ #02 AND + ;draw-cursor JSR2
( auto enter )
#00 ! ,&no-timer-end JCN
;enter-room JSR2
@@ 304,7 301,7 @@ BRK
;select JSR2
( release ) #00 .Mouse/state DEO
&no-hover
- ;draw-cursor JSR2
+ #42 .Mouse/state DEI #00 ! + ;draw-cursor JSR2
( release-record ) #0000 .Mouse/state DEO .cursor/last STZ
BRK
@@ 656,25 653,6 @@ RTN
RTN
-@draw-table ( -- )
-
- .frame/x LDZ2 .frame/y LDZ2
- OVR2
- OVR2 #0030 ++
- .table/a LDZ ;draw-card JSR2
- OVR2 #0038 ++
- OVR2 #0030 ++
- .table/b LDZ ;draw-card JSR2
- OVR2 #0070 ++
- OVR2 #0030 ++
- .table/c LDZ ;draw-card JSR2
- OVR2 #00a8 ++
- OVR2 #0030 ++
- .table/d LDZ ;draw-card JSR2
- POP2 POP2
-
-RTN
-
@draw-dialog ( dialog* -- )
STH2
@@ 693,6 671,19 @@ RTN
RTN
+@draw-table ( -- )
+
+ #0400
+ &loop
+ STHk
+ STHkr TOS #0038 ** .frame/x LDZ2 ++
+ #0030 .frame/y LDZ2 ++
+ STHr .table + LDZ ,draw-card JSR
+ INC GTHk ,&loop JCN
+ POP2
+
+RTN
+
@draw-card ( x* y* id -- )
STH
@@ 834,8 825,9 @@ RTN
RTN
-@draw-cursor ( -- )
+@draw-cursor ( color -- )
+ STH
( clear last cursor )
.cursor/x LDZ2 .Screen/x DEO2
.cursor/y LDZ2 .Screen/y DEO2
@@ 847,7 839,7 @@ RTN
( draw new cursor )
;pointer-icn .Screen/addr DEO2
- #42 .Mouse/state DEI #00 ! + .Screen/sprite DEO
+ STHr .Screen/sprite DEO
RTN