====----==== this is a messed up build that contains a busted 0.exe pan page system

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

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 4b31c4b481f6d15fdd960f4dff17214dba2f01c0..b35996d23e79456611933d32f63981d56263ebc8 100755 (executable)
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -25,28 +25,9 @@
 \r
 #ifndef BITMAP_H\r
 #define BITMAP_H\r
-#include "src/lib/types.h"\r
-#include "src/lib/16_head.h"\r
 \r
-#define     PALSIZE            768\r
+#include "src/lib/16_vl.h"\r
 \r
-typedef struct {\r
-       byte huge *data;\r
-       word width;\r
-       word height;\r
-       byte *palette;\r
-       word offset;\r
-//     byte far *font;\r
-} bitmap_t;\r
-\r
-typedef struct {\r
-       byte **data;\r
-       word ntiles;   /* the number of tiles */\r
-       word twidth;   /* width of the tiles */\r
-       word theight;  /* height of the tiles */\r
-       byte *palette; /* palette for the tile set */\r
-} tileset_t;\r
-\r
-bitmap_t bitmapLoadPcx(char *filename);\r
+bitmap_t bitmapLoadPcx(char *filename, global_game_variables_t *gv);\r
 tileset_t bitmapLoadPcxTiles(char *filename, word twidth, word theight);\r
 #endif\r