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

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 21009dcc..37d7f828 100644
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -1,24 +1,48 @@
+/* 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.
+ *
+ */
 /*
  * Functions and types for loading and manipulating bitmaps.
- */
+ */
+
 #ifndef BITMAP_H
 #define BITMAP_H
-#include <malloc.h>
-#include "src/lib/types.h"
+#include "src/lib/types.h"
+#include "src/lib/16_head.h"
+
 typedef struct {
-    byte far *data;
-    word width;
-    word height;
-    byte *palette;
-    word offset;
+	byte *data;
+	word width;
+	word height;
+	byte *palette;
+	word offset;
+//	byte far *font;
 } bitmap_t;
 
 typedef struct {
-    byte far **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 */
+	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);