X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fmodex16.h;h=787ae49dc10997cb98103d887f1ca8a5f8942776;hb=60d62fcab6d8310dc1ab11b40906e9a59e4c9c6a;hp=f21611746d38cc1ea14d0610a3cc56147e55a2ab;hpb=e6e6e9d77bbfa470b37906d4160ff1164332ef40;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
old mode 100644
new mode 100755
index f2161174..787ae49d
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -30,21 +30,22 @@
 #include "src/lib/bitmap.h"
 #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/192x144.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;
@@ -54,18 +55,23 @@ typedef union
 
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
-void modexEnter();
+void VGAmodeX(sword vq, global_game_variables_t *gv);
+void modexEnter(sword vq, global_game_variables_t *gv);
+long vgaGetMode();
 void modexLeave();
+void modexsetBaseXMode(page_t *page);
 page_t modexDefaultPage();
 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);
 void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color);
 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);
@@ -92,11 +98,18 @@ void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
-void bputs(/*bmp_t *bmp, */unsigned x, unsigned y, const char *s);
+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);
+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;
 #define SCREEN_SEG		0xa000
 #define VIDEO_INT		0x10
 #define SET_MODE		0x00
@@ -119,8 +132,8 @@ extern byte far*  VGA;  /* The VGA Memory */
 #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