Merge branch 'tedAI'

Author: steph72

Makefile

@@ -9,7 +9,8 @@
 
 # Space or comma separated list of cc65 supported target platforms to build for.
 # Default: c64 (lowercase!)
-TARGETS := c64, plus4, c128, pet
+#TARGETS := apple2
+TARGETS := c64, plus4, c128, pet, cx16
 
 # Name of the final, single-file executable.
 # Default: name of the current dir with target name appended
@@ -27,15 +28,16 @@ CONFIG  :=
 
 # Additional C compiler flags and options.
 # Default: none
-CFLAGS  =
+CFLAGS =
+#CFLAGS  = -DDEBUG
 
 # Additional assembler flags and options.
 # Default: none
 ASFLAGS =
 
 # Additional linker flags and options.
 # Default: none
-LDFLAGS =
+LDFLAGS = 
 
 # Path to the directory containing C and ASM sources.
 # Default: src

Makefile.options

@@ -0,0 +1 @@
+_OPTIONS_=optsize

kkwork.code-workspace

@@ -3,5 +3,16 @@
 		{
 			"path": "."
 		}
-	]
+	],
+	"settings": {
+		"files.associations": {
+			"6502.h": "c",
+			"time.h": "c",
+			"checks.h": "c",
+			"string.h": "c",
+			"cx16.h": "c",
+			"chargen.h": "c",
+			"stdio.h": "c"
+		}
+	}
 }

src/apple2/chargen.c

@@ -0,0 +1,42 @@
+
+const char dice[6][25] = {
+
+	{108, 98, 98, 98, 123,
+	 225, 160, 160, 160, 97,
+	 225, 160, 209, 160, 97,
+	 225, 160, 160, 160, 97,
+	 124, 226, 226, 226, 126},
+
+	{108, 98, 98, 98, 123,
+	 225, 160, 160, 209, 97,
+	 225, 160, 160, 160, 97,
+	 225, 209, 160, 160, 97,
+	 124, 226, 226, 226, 126},
+
+	{108, 98, 98, 98, 123,
+	 225, 160, 160, 209, 97,
+	 225, 160, 209, 160, 97,
+	 225, 209, 160, 160, 97,
+	 124, 226, 226, 226, 126},
+
+	{108, 98, 98, 98, 123,
+	 225, 209, 160, 209, 97,
+	 225, 160, 160, 160, 97,
+	 225, 209, 160, 209, 97,
+	 124, 226, 226, 226, 126},
+
+	{108, 98, 98, 98, 123,
+	 225, 209, 160, 209, 97,
+	 225, 160, 209, 160, 97,
+	 225, 209, 160, 209, 97,
+	 124, 226, 226, 226, 126},
+
+	{108, 98, 98, 98, 123,
+	 225, 209, 160, 209, 97,
+	 225, 209, 160, 209, 97,
+	 225, 209, 160, 209, 97,
+	 124, 226, 226, 226, 126}
+
+};
+
+

src/apple2/io.c

@@ -0,0 +1,94 @@
+
+#include <6502.h>
+#include <apple2.h>
+#include <conio.h>
+#include "../io.h"
+#include "../chargen.h"
+
+const unsigned char colTable = 5;
+const unsigned char colLegend = 14;
+
+const unsigned char colBackground = 0;
+const unsigned char colBorder = 0;
+const unsigned char colText = 5;
+
+const unsigned char colSplash = 4;
+const unsigned char colSplashRed = 2;
+
+const unsigned char colTempValue = 11; // temporary roll:
+const unsigned char colEvenValue = 5;  // even row roll: green
+const unsigned char colOddValue = 13;  // odd row roll: light green
+const unsigned char colUpperSum = 4;   // upper sum
+const unsigned char colLowerSum = 3;   // lower sum
+const unsigned char colBonus = 2;      // bonus
+const unsigned char colCurrentRollIdx = 8; 
+
+#define screen (unsigned char *)0x8000u
+
+void sleep(int secs){
+    
+}
+
+void startup(void)
+{
+    clrscr();
+}
+
+void initIO(void)
+{
+    // TODO
+}
+
+void initDiceDisplay() {
+    // nothing to be done on PET
+}
+
+void __fastcall__ _plotDice(unsigned char value, unsigned char x, unsigned char y, char r)
+{
+    register unsigned char c;
+    register unsigned char idx;
+
+    unsigned char *row1, *row2, *row3, *row4, *row5;
+    idx = value - 1;
+    if (r)
+        r = 128;
+
+    row1 = (unsigned char *)screen + x + (40 * y);
+    row2 = (unsigned char *)row1 + 40;
+    row3 = (unsigned char *)row2 + 40;
+    row4 = (unsigned char *)row3 + 40;
+    row5 = (unsigned char *)row4 + 40;
+
+    if (value == 0)
+    {
+        for (c = 0; c < 5; ++c)
+        {
+            row1[c] = 32;
+            row2[c] = 32;
+            row3[c] = 32;
+            row4[c] = 32;
+            row5[c] = 32;
+        }
+    }
+    else
+    {
+        for (c = 0; c < 5; ++c)
+        {
+            row1[c] = r + dice[idx][c];
+            row2[c] = r + dice[idx][c + 5];
+            row3[c] = r + dice[idx][c + 10];
+            row4[c] = r + dice[idx][c + 15];
+            row5[c] = r + dice[idx][c + 20];
+        }
+    }
+}
+
+void plotDice(unsigned char nr, unsigned char value, char revers)
+{
+    _plotDice(value, 35, nr * 5, revers);
+}
+
+void eraseDie(unsigned char nr)
+{
+    _plotDice(0, 35, nr * 5, 0);
+}

src/c64/io.c

@@ -2,6 +2,7 @@
 #include <cbm.h>
 #include <conio.h>
 #include <c64.h>
+#include <string.h>
 #include "../io.h"
 #include "../chargen.h"
 
@@ -53,12 +54,16 @@ void installCharset(void)
     SEI();
     *procio = (*procio & 251);
     adr2 = (unsigned char *)49152u;
+    adr1 = (unsigned char)
+    memcpy(0xc000,0xd000,4096);
+    /*
     for (adr1 = (unsigned char *)53248u; adr1 <= (unsigned char *)57343u; ++adr1)
     {
         *b = (unsigned char)adr1;
         *adr2 = *adr1;
         ++adr2;
     }
+    */
     *procio = (*procio | 4);
     *screenP = (unsigned char)200;