X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbitmap.h;h=b35996d23e79456611933d32f63981d56263ebc8;hb=fa252ebd82649e4f3bab4a53228828766713ad6c;hp=37d7f82858857ddd67a1be2a82e47ee49ce3bdb9;hpb=f1605e99959acfb32b36ae875601fc14dd670742;p=16.git

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 37d7f828..b35996d2 100755
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -1,50 +1,33 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
 /*
  * Functions and types for loading and manipulating bitmaps.
- */
+ */
 
 #ifndef BITMAP_H
-#define BITMAP_H
-#include "src/lib/types.h"
-#include "src/lib/16_head.h"
+#define BITMAP_H
 
-typedef struct {
-	byte *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