yay./w.sh

[16.git] / src / lib / modex16.h

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index e123b4e110ab2af10bff9785a2b76c1f1f2f01a3..cbd2ba6f3b29bc19d6722b3da62d3868130f557c 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -27,12 +27,17 @@
 //#include <conio.h>
 
 #include "src/lib/types.h"
+#include "src/lib/16_head.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
-#include "src/lib/16_head.h"
+#include "src/lib/modex16/planar16.h"
 #include "src/lib/16text.h"
+#include "src/lib/modex16/16render.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
 //192x144 = 12x9
@@ -46,19 +51,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 sw;                /* screen width */
-       word sh;                /* screen heigth */
-       word width;             /* virtual width of the page */
-       word height;    /* virtual height of the page */
-       word tw;
-       word th;
-} page_t;
-
 typedef union
 {
        byte red;
@@ -72,22 +64,15 @@ void VGAmodeX(sword vq, 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 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);
+/* moved to src/lib/modex16/16render.c */
 void modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);
 
 /* Palette fade and flash effects */
@@ -110,6 +95,7 @@ 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);
@@ -128,9 +114,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