Browse code

Cleanup bifurcan

neauoire authored on 23/04/2021 18:25:19
Showing 1 changed files
... ...
@@ -10,19 +10,17 @@
10 10
 ( devices )
11 11
 
12 12
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
13
-|10 @Console    [ &pad    $8 &char     $1 &byte   $1 &short $2 &string $2 ]
14 13
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &color $1 ]
15
-|60 @Mouse      [ &vector $2 &x       $2 &y      $2 &state $1 &chord $1 ]
14
+|60 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
16 15
 |a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
17 16
 
18 17
 ( variables )
19 18
 
20 19
 |0000
21 20
 
22
-@last $1
23
-@color $1
21
+@last  $1
24 22
 @style $1
25
-@pointer [ &x  $2 &y  $2 ]
23
+@pointer [ &x $2 &y $2 ]
26 24
 @center  [ &x $2 &y $2 ]
27 25
 @anchor  [ &x $2 &y $2 ]
28 26
 
... ...
@@ -44,7 +42,7 @@
44 42
 	.Screen/height DEI2 2/ .center/y POK2
45 43
 
46 44
 	( background ) 
47
-	;tiles #21 ;cover-pattern JSR2
45
+	;tiles ;cover-pattern JSR2
48 46
 	;redraw JSR2
49 47
 
50 48
 BRK
... ...
@@ -66,10 +64,9 @@ BRK
66 64
 	;draw-cursor JSR2
67 65
 
68 66
 	.Mouse/state DEI #00 EQU ,&no-touch JNZ
69
-		.style PEK INC #03 MOD .style POK
70
-		.style PEK .Console/byte DEO
71
-		;tiles .style PEK #10 MUL TOS ADD2 #21 ;cover-pattern JSR2
72
-		;redraw JSR2
67
+		( incr ) .style PEK INC #03 MOD .style POK
68
+		( bg ) ;tiles .style PEK #10 MUL TOS ADD2 ;cover-pattern JSR2
69
+		( fg ) ;redraw JSR2
73 70
 		( release ) #00 .Mouse/state DEO
74 71
 	&no-touch
75 72
 
... ...
@@ -124,16 +121,16 @@ RTN
124 121
 
125 122
 RTN
126 123
 
127
-@cover-pattern ( addr color -- )
124
+@cover-pattern ( addr -- )
128 125
 	
129
-	( load ) .color POK .Screen/addr DEO2
126
+	( load ) .Screen/addr DEO2
130 127
 	#0000 .Screen/height DEI2
131 128
 	&ver
132 129
 		( save ) OVR2 .Screen/y DEO2
133 130
 		#0000 .Screen/width DEI2
134 131
 		&hor
135 132
 			( save ) OVR2 .Screen/x DEO2
136
-			( draw ) .color PEK .Screen/color DEO
133
+			( draw ) #21 .Screen/color DEO
137 134
 			( incr ) SWP2 8+ SWP2
138 135
 			OVR2 OVR2 LTH2 ,&hor JNZ
139 136
 		POP2 POP2