X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=51c911410c70486e67668e67c9d3569c1a5978d5;hb=8aa6da6bc6c505b4213ec52d9809d7571c44f880;hp=90e7d9cd1cc3335531948130c4ce84b52c5f0a9b;hpb=82c03114f1398b387713ae095b130ac9c57d96bc;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 90e7d9cd..51c91141 100644
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -3,10 +3,10 @@
  */
 #ifndef MODEX16_H
 #define MODEX16_H
-#include <conio.h>
-#include "src\lib\types.h"
-#include "src\lib\bitmap.h"
-#include "src\lib\planar.h"
+//#include <conio.h>
+#include "src/lib/types.h"
+#include "src/lib/bitmap.h"
+#include "src/lib/planar.h"
 
 /* -========================== Types & Macros ==========================- */
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))
@@ -14,13 +14,20 @@
 #define SELECT_ALL_PLANES() outpw(0x03c4, 0xff02)
 
 typedef struct {
-    byte far* data;	/* the data for the page */
+    byte huge* data;	/* the data for the page */
     word dx;		/* col we are viewing on the virtual screen */
     word dy;		/* row we are viewing on the virtual screen */
     word width;		/* virtual width of the page */
     word height;	/* virtual height of the page */
 } page_t;
 
+typedef union
+{
+	byte red;
+	byte green;
+	byte blue;
+} rgb_t;
+
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
 void modexEnter();
@@ -55,10 +62,10 @@ void modexPalBlack();
 void modexPalWhite();
 
 /* utility functions */
-void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp);
-void modexPalUpdate2(byte *p);
-void modexPalUpdate3(byte *p);
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z);
+void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
+void modexPalUpdate1(byte *p);
+void modexPalUpdate0(byte *p);
+void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 void modexWaitBorder();
 
 /* -======================= Constants & Vars ==========================- */