X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fbitmap.h;h=b35996d23e79456611933d32f63981d56263ebc8;hb=45f3e2d77b5287888a171d442f74ca4e0e807d9b;hp=95c6782c71de508264d72b776156428848334b69;hpb=415ffb75c84f777d2ce7e3501079823aa544d63f;p=16.git

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