X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.h;h=3c47ee074a949a9e359bbeb43ae14bc7fc4a789a;hb=92c617f0987b290f1e8032ec97004478944f192e;hp=f311a69ede71c0b1a0d5dfe16c30f96872de06c0;hpb=1994e0d47edc486c81a3d6086574132870c644ed;p=16.git

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
old mode 100644
new mode 100755
index f311a69e..3c47ee07
--- 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,27 +24,54 @@
  */
 #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"
+
+//TODO dos lib vga implementation ^^
+//#define DOSLIBVGA
+
+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
+
+//temp defines
+#define TILEWH 16
+#define QUADWH			TILEWH/2
 
 /* -========================== Types & Macros ==========================- */
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))
 #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 */
-} page_t;
+#define     PALSIZE            768
 
 typedef union
 {
@@ -55,21 +82,19 @@ typedef union
 
 /* -============================ Functions =============================- */
 /* mode switching, page, and plane functions */
-void modexEnter();
+void VGAmodeX(sword vq, 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 modexNextPage0(page_t *p, word x, word y);
+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 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 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 */
@@ -92,9 +117,15 @@ 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(int x, int y, byte color);
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
+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, 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);
 void modexWaitBorder();
 
 /* -======================= Constants & Vars ==========================- */
@@ -104,9 +135,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
@@ -118,11 +146,11 @@ 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 */
-#define PAL_WRITE_REG           0x03C8   /* Color register, write address */
-#define PAL_DATA_REG            0x03C9   /* Color register, data port */
-#define PAL_SIZE                (256 * 3)
+#define PAL_READ_REG			0x03C7   /* Color register, read address */
+#define PAL_WRITE_REG		   0x03C8   /* Color register, write address */
+#define PAL_DATA_REG			0x03C9   /* Color register, data port */
+#define PAL_SIZE				(256 * 3)
 #endif