X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=808a4b7bc06a9eec2c60cedf400410d1c496cd0a;hb=17be56acf6a4d9c44762ea85bc6998955525e864;hp=41b67de269ab544d30cadf8d9f315f32691dd487;hpb=bba7fa83186d755c585791acec1db6c6d58164db;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 41b67de2..808a4b7b 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -31,21 +31,23 @@
 #include "src/lib/planar.h"
 #include "src/lib/16_head.h"
 #include "src/lib/16text.h"
+#include "src/lib/modex16/320x240.h"
+#include "src/lib/modex16/320x200.h"
+#include "src/lib/modex16/192x144.h"
+#include "src/lib/modex16/256x192.h"
+
+//320x240 = 20x15
+//192x144 = 12x9
+
+//temp defines
+#define TILEWH 16
+#define QUADWH			TILEWH/2
 
 /* -========================== Types & Macros ==========================- */
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))
 #define PLANE(x) (1<< (x&3))
 #define SELECT_ALL_PLANES() outpw(0x03c4, 0xff02)
 
-typedef struct {
-	word id;	/* the Identification number of the page~ For layering~ */
-    byte far* 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;
@@ -56,11 +58,13 @@ typedef union
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
 void VGAmodeX(sword vq, global_game_variables_t *gv);
-void modexEnter();
+void modexEnter(sword vq, global_game_variables_t *gv);
+long vgaGetMode();
 void modexLeave();
-page_t modexDefaultPage();
+void modexsetBaseXMode(page_t *page);
+page_t modexDefaultPage(page_t *p);
 page_t modexNextPage(page_t *p);
-page_t modexNextPage0(page_t *p, word x, word y);
+page_t modexNextPageFlexibleSize(page_t *p, word x, word y);
 void modexShowPage(page_t *page);
 void modexPanPage(page_t *page, int dx, int dy);
 void modexSelectPlane(byte plane);
@@ -100,20 +104,21 @@ 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);
 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();
 
 /* -======================= Constants & Vars ==========================- */
 extern byte far*  VGA;  /* The VGA Memory */
-extern int old_mode;
+//extern int old_mode;
 #define SCREEN_SEG		0xa000
 #define VIDEO_INT		0x10
 #define SET_MODE		0x00
 #define VGA_256_COLOR_MODE 	0x13
 #define TEXT_MODE		0x03
-#define SCREEN_WIDTH		320
-#define SCREEN_HEIGHT		240
-#define PAGE_SIZE		(word)(SCREEN_WIDTH/4 * SCREEN_HEIGHT)
+//#define SCREEN_WIDTH		320
+//#define SCREEN_HEIGHT		240
+//#define PAGE_SIZE		(word)(SCREEN_WIDTH/4 * SCREEN_HEIGHT)
 
 #define AC_INDEX		0x03c0
 #define SC_INDEX		0x03c4
@@ -128,8 +133,8 @@ extern int old_mode;
 #define INPUT_STATUS_1		0x03da
 #define DISPLAY_ENABLE		0x01
 #define MAP_MASK		0x02
-#define PAL_READ_REG            0x03C7   /* Color register, read address */
-#define PAL_WRITE_REG           0x03C8   /* Color register, write address */
-#define PAL_DATA_REG            0x03C9   /* Color register, data port */
-#define PAL_SIZE                (256 * 3)
+#define PAL_READ_REG			0x03C7   /* Color register, read address */
+#define PAL_WRITE_REG		   0x03C8   /* Color register, write address */
+#define PAL_DATA_REG			0x03C9   /* Color register, data port */
+#define PAL_SIZE				(256 * 3)
 #endif