ww

[16.git] / src / lib / modex16.h

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index eae44931bc8045804df9929949ab5cd336c3bae6..94a69ad59a38cefabb9fb0b8b6c5c7fd25f16116 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -31,12 +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"
-extern byte gfxtest;
+// #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 <hw/cpu/cpu.h>
+#include <hw/dos/dos.h>
+#include <hw/vga/vga.h>
+#include <hw/vga/vrl.h>
 
 static struct pcxHeader {
        byte id;
@@ -80,11 +84,11 @@ typedef union
 
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
-void VGAmodeX(sword vq, global_game_variables_t *gv);
-void modexEnter(sword vq, global_game_variables_t *gv);
+void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv);
+void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv);
 long 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);
@@ -128,7 +132,6 @@ void modexWaitBorder();
 
 /* -======================= Constants & Vars ==========================- */
 extern byte far*  VGA;  /* The VGA Memory */
-//extern int old_mode;
 #define SCREEN_SEG             0xa000
 #define VIDEO_INT              0x10
 #define SET_MODE               0x00