X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fmodex16.h;h=eae44931bc8045804df9929949ab5cd336c3bae6;hb=535f618e80aa6546e61907026b2451e123655a5b;hp=9c9ea4bb6a4c00f54215d5e6077a13f9db456331;hpb=2eb78909ad7e8079fbec7dbe794fe0eac01e15de;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 9c9ea4bb..eae44931 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
  *
  * This file is part of Project 16.
  *
@@ -24,18 +24,39 @@
  */
 #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/256x192.h"
 #include "src/lib/modex16/192x144_.h"
 #include "src/lib/modex16/160x120.h"
+extern byte gfxtest;
+
+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
@@ -48,6 +69,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
 {
@@ -70,13 +92,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 modexDrawPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);
-void modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite); /*temp*/
-void oldDrawBmp(byte far* 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 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 */
@@ -104,7 +120,7 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 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);
@@ -118,9 +134,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
@@ -132,7 +145,7 @@ extern byte far*  VGA;  /* The VGA Memory */
 #define HIGH_ADDRESS 		0x0C
 #define LOW_ADDRESS		0x0D
 #define VRETRACE		0x08
-#define INPUT_STATUS_1		0x03da
+//#define INPUT_STATUS_1		0x03da	defined in 16_head
 #define DISPLAY_ENABLE		0x01
 #define MAP_MASK		0x02
 #define PAL_READ_REG			0x03C7   /* Color register, read address */