X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_vl.h;h=b1b03a21f60874ff59d21792f43222017c894c5b;hb=86619c6a50b07c52481161da4b549ffb5e403e66;hp=3ce8d71afc9ef1b65320a3369e6e6186cedf54df;hpb=0a79071b241fd133918bf178f5bd322368e4957c;p=16.git

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 3ce8d71a..b1b03a21 100755
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -26,7 +26,6 @@
 #define MODEX16_H
 
 #include "src/lib/16_head.h"
-#include "src/lib/bitmap.h"
 //#include "src/lib/planar.h"
 //#include "src/lib/modex16/16planar.h"
 #include "src/lib/16text.h"
@@ -52,11 +51,12 @@
 #define TILEWHD	TILEWH*2
 #define QUADWH			TILEWH/2
 
+//#define OLDBGPRESERVE
+
 /* -========================== 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)
-#define     PALSIZE            768
 
 typedef union
 {
@@ -120,9 +120,11 @@ void modexFlashOff(word fade, byte *palette);
 
 /* palette loading and saving */
 void modexPalSave(byte *palette);
-byte *modexNewPal();
-void modexLoadPalFile(char *filename, byte **palette);
+//byte *modexNewPal();
+void modexLoadPalFile(char *filename, byte *palette);
 void VL_LoadPalFile(const char *filename, byte *palette);
+void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o);
+void VL_UpdatePaletteWrite(byte *palette, word o);
 void modexSavePalFile(char *filename, byte *palette);
 
 /* fixed palette functions */
@@ -130,11 +132,9 @@ void modexPalBlack();
 void modexPalWhite();
 
 /* utility functions */
-void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
-void modexPalUpdate1(byte *p);
+void modexPalUpdate(byte *p);
 void modexPalUpdate0(byte *p);
 void modexPalOverscan(word col);
-void modexchkcolor(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);
 
@@ -165,12 +165,14 @@ static inline byte modexreadPixel(page_t *page, int x, int y, word addr)
 #endif
 
 void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, word col, word bgcol, word addr);
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
+void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col, word bgcol, const byte *str);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
 void modexpdump(page_t *pee);
 void modexcls(page_t *page, byte color, byte *Where);
 void VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);
 void modexWaitBorder();
+void modexWaitBorder_start();
+void modexWaitBorder_end();
 void VL_PrintmodexmemInfo(video_t *v);
 
 #endif