X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=808a4b7bc06a9eec2c60cedf400410d1c496cd0a;hb=516c01e6ea6ac9bf49faba2485e8a99ba6d48340;hp=e36e13dbfad4fee891bafdd4d9aa3a4323dded7f;hpb=c3104b1494bd0f31ce49e3365d36e4ace02e69c7;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index e36e13db..808a4b7b 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -31,9 +31,13 @@
 #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
-//256x192 = 16x12
+//192x144 = 12x9
 
 //temp defines
 #define TILEWH 16
@@ -44,17 +48,6 @@
 #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 */
-	word tw;
-	word th;
-} page_t;
-
 typedef union
 {
 	byte red;
@@ -65,9 +58,11 @@ typedef union
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
 void VGAmodeX(sword vq, global_game_variables_t *gv);
-void modex__320x240_256__Enter(global_game_variables_t *gv);
+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 modexNextPageFlexibleSize(page_t *p, word x, word y);
 void modexShowPage(page_t *page);
@@ -78,7 +73,6 @@ 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);
@@ -110,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