polished 16_vrs.h and put into make file AND! updated copyright to add yakui lover...

[16.git] / src / lib / mapread.c

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
old mode 100644 (file)
new mode 100755 (executable)
index 7fc94d1..8d98c76
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,3 +1,25 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2016 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.
+ *
+ */
+
 #include "src/lib/mapread.h"
 
 int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
@@ -71,10 +93,12 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
 //                     fprintf(stdout, "\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
                        map->data = malloc(sizeof(byte) * (t+1)->size);
                        map->tiles = malloc(sizeof(tiles_t));
-                       //map->tiles->data = malloc(sizeof(bitmap_t));
+                       map->tiles->btdata = malloc(sizeof(bitmap_t));
                        //fix this to be far~
                        bp = bitmapLoadPcx("data/ed.pcx");
-                       map->tiles->data = &bp;
+//                     bp = bitmapLoadPcx("data/koishi^^.pcx");
+                       map->tiles->btdata = &bp;
+                       map->tiles->data = planar_buf_from_bitmap(&bp);
                        //map->tiles->data->data = malloc((16/**2*/)*16);
                        //map->tiles->data->width = (16/**2*/);
                        //map->tiles->data->height= 16;