X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=fe96a78fde3dc98afda722dba483c540469b6ef0;hb=5c022e8e83924eba7882be2ab3824f63d6ce0c3c;hp=c21cfc2f109d336278b38e9f89dae038c0d894e0;hpb=5d3247c2c17bc8133d3dbae26cadb0268e964710;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index c21cfc2f..fe96a78f 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -31,14 +31,16 @@
 #include "src/lib/modex16/16planar.h"
 #include "src/lib/16text.h"
 #include "src/lib/modex16/16render.h"
-#include "src/lib/modex16/320x240.h"
-#include "src/lib/modex16/320x200.h"
-#include "src/lib/modex16/256x192.h"
-#include "src/lib/modex16/192x144_.h"
-#include "src/lib/modex16/160x120.h"
+// #include "src/lib/modex16/320x240.h"
+// #include "src/lib/modex16/320x200.h"
+// #include "src/lib/modex16/256x192.h"
+// #include "src/lib/modex16/192x144_.h"
+// #include "src/lib/modex16/160x120.h"
 
-//TODO dos lib vga implementation ^^
-//#define DOSLIBVGA
+#include <hw/cpu/cpu.h>
+#include <hw/dos/dos.h>
+#include <hw/vga/vga.h>
+#include <hw/vga/vrl.h>
 
 static struct pcxHeader {
 	byte id;
@@ -82,11 +84,11 @@ typedef union
 
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
-void VGAmodeX(sword vq, boolean cm, global_game_variables_t *gv);
-void modexEnter(sword vq, boolean cm, global_game_variables_t *gv);
-long vgaGetMode();
+void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv);
+void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv);
+byte vgaGetMode();
 void modexLeave();
-void modexsetBaseXMode(page_t *page);
+void modexsetBaseXMode();
 page_t modexDefaultPage(page_t *p);
 page_t modexNextPage(page_t *p);
 page_t modexNextPageFlexibleSize(page_t *p, word x, word y);
@@ -118,15 +120,16 @@ void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
 void modexPalOverscan(byte *p, word col);
-void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
+void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 void modexputPixel(page_t *page, int x, int y, byte color);
 byte modexgetPixel(page_t *page, int x, int y);
 void modexhlin(page_t *page, word xl, word xh, word y, word color);
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
-void pdump(page_t *pee);
-void cls(page_t *page, byte color, byte *Where);
-void modexWaitBorder();
+void modexpdump(page_t *pee);
+void modexcls(page_t *page, byte color, byte *Where);
+//void modexWaitBorder();
+void bios_cls();
 
 /* -======================= Constants & Vars ==========================- */
 extern byte far*  VGA;  /* The VGA Memory */