X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=a07121ab9f875f97c55e2812803fe31a7bcc938b;hb=45582828e24886e907407a373c7d82ebd2ace931;hp=ae9ae3ede4cdff272a89d407934b7db5b71c6f2a;hpb=37905954f1035172eab97d8cc398565e9947930e;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index ae9ae3ed..a07121ab 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -27,20 +27,23 @@
 
 #include "src/lib/16_head.h"
 #include "src/lib/bitmap.h"
-#include "src/lib/planar.h"
-#include "src/lib/modex16/16planar.h"
+//#include "src/lib/planar.h"
+//#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/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"
 
+#ifdef __WATCOMC__
 #include <hw/cpu/cpu.h>
 #include <hw/dos/dos.h>
 #include <hw/vga/vga.h>
 #include <hw/vga/vrl.h>
+#include <hw/vga/vrs.h>
+#endif
 
 static struct pcxHeader {
 	byte id;
@@ -66,7 +69,8 @@ static struct pcxHeader {
 //192x144 = 12x9
 
 //temp defines
-#define TILEWH 16
+#define TILEWH	16
+#define TILEWHD	TILEWH*2
 #define QUADWH			TILEWH/2
 
 /* -========================== Types & Macros ==========================- */
@@ -147,7 +151,7 @@ void modexPalWhite();
 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 modexPalOverscan(word col);
 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);
@@ -183,6 +187,6 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c
 void modexpdump(page_t *pee);
 void modexcls(page_t *page, byte color, byte *Where);
 void modexWaitBorder();
-void bios_cls();
+void modexprintmeminfo(video_t *v);
 
 #endif