--- np2/lio/gpset.c	2003/10/16 17:58:27	1.1
+++ np2/lio/gpset.c	2005/02/07 14:46:12	1.12
@@ -1,34 +1,90 @@
 #include	"compiler.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"lio.h"
 
 
 typedef struct {
-	BYTE	x[2];
-	BYTE	y[2];
-	BYTE	pal;
-} MEMGPSET;
-
-
-BYTE lio_gpset(void) {
-
-	MEMGPSET	gpset;
-	SINT16		x;
-	SINT16		y;
-
-	i286_memstr_read(I286_DS, I286_BX, &gpset, sizeof(gpset));
-	if (gpset.pal >= lio.gcolor1.palmax) {
-		if (I286_AH == 2) {
-			gpset.pal = lio.gcolor1.bgcolor;
+	UINT8	x[2];
+	UINT8	y[2];
+	UINT8	pal;
+} GPSET;
+
+typedef struct {
+	UINT8	x[2];
+	UINT8	y[2];
+} GPOINT2;
+
+
+// ---- PSET
+
+REG8 lio_gpset(GLIO lio) {
+
+	GPSET	dat;
+	SINT16	x;
+	SINT16	y;
+
+	lio_updatedraw(lio);
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	x = (SINT16)LOADINTELWORD(dat.x);
+	y = (SINT16)LOADINTELWORD(dat.y);
+	if (dat.pal == 0xff) {
+		if (CPU_AH == 1) {
+			dat.pal = lio->work.fgcolor;
+		}
+		else {
+			dat.pal = lio->work.bgcolor;
+		}
+	}
+	lio_pset(lio, x, y, dat.pal);
+	return(LIO_SUCCESS);
+}
+
+
+// ---- GPOINT2
+
+REG8 lio_gpoint2(GLIO lio) {
+
+	GPOINT2	dat;
+	SINT16	x;
+	SINT16	y;
+	REG8	ret;
+	UINT32	addr;
+	UINT	sft;
+	UINT	pl;
+const UINT8	*ptr;
+
+	lio_updatedraw(lio);
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	x = (SINT16)LOADINTELWORD(dat.x);
+	y = (SINT16)LOADINTELWORD(dat.y);
+	if ((lio->draw.x1 > x) || (lio->draw.x2 < x) ||
+		(lio->draw.y1 > y) || (lio->draw.y2 < y)) {
+		ret = 0xff;
+	}
+	else {
+		ret = 0;
+		addr = (x >> 3) + (y * 80);
+		if (lio->draw.flag & LIODRAW_UPPER) {
+			addr += 16000;
+		}
+		addr += lio->draw.base;
+		sft = (~x) & 7;
+		if (!(lio->draw.flag & LIODRAW_MONO)) {
+			for (pl=0; pl<3; pl++) {
+				ptr = mem + addr + lioplaneadrs[pl];
+				ret += (((*ptr) >> sft) & 1) << pl;
+			}
+			if (lio->draw.flag & LIODRAW_4BPP) {
+				ptr = mem + addr + lioplaneadrs[3];
+				ret += (((*ptr) >> sft) & 1) << 3;
+			}
 		}
 		else {
-			gpset.pal = lio.gcolor1.fgcolor;
+			ptr = mem + addr + lioplaneadrs[lio->draw.flag & LIODRAW_PMASK];
+			ret = ((*ptr) >> sft) & 1;
 		}
 	}
-	x = (SINT16)LOADINTELWORD(gpset.x);
-	y = (SINT16)LOADINTELWORD(gpset.y);
-	lio_pset(x, y, gpset.pal);
-	return(0);
+	CPU_AL = ret;
+	return(LIO_SUCCESS);
 }