X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fbitmap.h;h=06570a9a4851cfdb6918e3b8bbe5876e89bb2ecb;hb=5a56d29aee1c9268e92c8df8e32846f5dfd63c1a;hp=1a2abcf9dd08da4f065bc612c7bb9c407b0b054f;hpb=d9e8696a3a67052729b1b783f0f3f1b0d20d9e9a;p=16.git
diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
old mode 100644
new mode 100755
index 1a2abcf9..06570a9a
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -1,49 +1,32 @@
-/* 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 , 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-2016 sparky4 & pngwen & andrius4669 & joncampbell123
+ *
+ * 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 , 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/lib_head.h"
+#define BITMAP_H
-typedef struct {
- byte *data;
- word width;
- word height;
- byte *palette;
- word offset;
-// byte far *font;
-} bitmap_t;
-
-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;
+#include "src/lib/modex16.h"
bitmap_t bitmapLoadPcx(char *filename);
tileset_t bitmapLoadPcxTiles(char *filename, word twidth, word theight);