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 5a2655d69446258d01719a1694a4decdd981bec5..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.
  *
@@ -36,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;
@@ -144,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 */