X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=8068a02469aa3ade53ecf94fc24c74aaf900c801;hb=73a484ef8bbdbcb82bde5580b77001e7c54265f8;hp=5d88e618fd623f873db3e368747cc2834038c466;hpb=0910c3436fc82a593163cdb1525092b84eb85479;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 5d88e618..8068a024 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -32,6 +32,13 @@
 #include "src/lib/16_head.h"
 #include "src/lib/16text.h"
 
+//320x240 = 20x15
+//256x192 = 16x12
+
+//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))
@@ -39,11 +46,13 @@
 
 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 */
+	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 */
+	word tw;
+	word th;
 } page_t;
 
 typedef union
@@ -60,7 +69,7 @@ void modexEnter();
 void modexLeave();
 page_t modexDefaultPage();
 page_t modexNextPage(page_t *p);
-page_t modexNextPageAppend(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);
@@ -69,6 +78,7 @@ void oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite);
 //void CDrawBmp(byte far* vgamem, page_t* page, int x, int y, bitmap_t *bmp, byte sprite);
 void modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp);
 void modexDrawBmpRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
+void modex_sparky4_DrawBmpRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
 void modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp);
 void modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp);
 void modexDrawSpriteRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
@@ -128,8 +138,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