X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=8a8d5d87396c62a3eff362fd3036459522949446;hb=1ea8e6d438d3af98b050dc7bcd8b935a4bec3511;hp=e3f40b441bbee036658cc132a5a95a89d4a28a17;hpb=3aa2d573c4dace5af78bf8f8f21e46ca36334803;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
old mode 100644
new mode 100755
index e3f40b44..8a8d5d87
--- 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,17 +93,20 @@ 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;
-			map->tiles->tileHeight = 16;
-			map->tiles->tileWidth = 16;
-			map->tiles->rows = 1;
+			//map->tiles->data->width = (16/**2*/);
+			//map->tiles->data->height= 16;
+			map->tiles->tileHeight = 16;
+			map->tiles->tileWidth = 16;
+			map->tiles->rows = 1;
 			map->tiles->cols = 1;
+			map->tiles->debug_text=false;
 			strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
 		}
 		else
@@ -127,7 +152,6 @@ int loadmap(char *mn, map_t *map)
 	char *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
-//----	char *buff = &buf;
 	static char js_ss[16];
 
 	jsmn_parser p;