X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=421033aa393eb18a39e945faae01a0ceb0b16043;hb=d711e094545cfe922ae549d3865f7ed9fe93e93f;hp=d7d8e193e342ae63d288ba3b50a74c91cc3bc6e3;hpb=7a02e4f5de25d0cc1bd9100e67274c52ca5193ba;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index d7d8e193..421033aa 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -32,10 +32,13 @@
 #include "src/lib/16_head.h"
 #include "src/lib/16text.h"
 #include "src/lib/modex16/320x240.h"
-#include "src/lib/modex16/192x144.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"
 
 //320x240 = 20x15
-//256x192 = 16x12
+//192x144 = 12x9
 
 //temp defines
 #define TILEWH 16
@@ -46,17 +49,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;
@@ -67,23 +59,22 @@ 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 modex__192x144_256__Enter(global_game_variables_t *gv);
+void modexEnter(sword vq, global_game_variables_t *gv);
 long vgaGetMode();
 void modexLeave();
-void modexsetBaseXMode(void);
-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);
 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 DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite);
 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);
@@ -109,12 +100,14 @@ void modexPalWhite();
 void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
+void modexPalOverscan(byte *p, word col);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 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();
 
@@ -126,9 +119,9 @@ extern byte far*  VGA;  /* The VGA Memory */
 #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