wwww

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

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index bfde23907b03b4cb5b9f9ef916b4f0646855957b..5a2655d69446258d01719a1694a4decdd981bec5 100755 (executable)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -24,17 +24,38 @@
  */
 #ifndef MODEX16_H
 #define MODEX16_H
-//#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/16planar.h"
 #include "src/lib/16text.h"
+#include "src/lib/modex16/16render.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"
+#include "src/lib/modex16/192x144_.h"
+#include "src/lib/modex16/160x120.h"
+
+static struct pcxHeader {
+       byte id;
+       byte version;
+       byte encoding;
+       byte bpp;
+       word xmin;
+       word ymin;
+       word xmax;
+       word ymax;
+       word hres;
+       word vres;
+       byte pal16[48];
+       byte res1;
+       word bpplane;
+       word palType;
+       word hScreenSize;
+       word vScreenSize;
+       byte padding[54];
+} head;
 
 //320x240 = 20x15
 //192x144 = 12x9
@@ -47,6 +68,7 @@
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))
 #define PLANE(x) (1<< (x&3))
 #define SELECT_ALL_PLANES() outpw(0x03c4, 0xff02)
+#define     PALSIZE            768
 
 typedef union
 {
@@ -69,14 +91,7 @@ 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 */
@@ -99,11 +114,12 @@ 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 modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 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);
@@ -117,9 +133,6 @@ 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 AC_INDEX               0x03c0
 #define SC_INDEX               0x03c4