Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f4a07ad40d69021e98c27a05bda9e91510ed803e..eae44931bc8045804df9929949ab5cd336c3bae6 100755 (executable)
--- 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,7 +24,6 @@
  */
 #ifndef MODEX16_H
 #define MODEX16_H
-//#include <conio.h>
 
 #include "src/lib/16_head.h"
 #include "src/lib/bitmap.h"
@@ -37,6 +36,7 @@
 #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;
@@ -120,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);
@@ -134,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
@@ -148,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 */