X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.c;h=1afb7bc8efe47dd95941e9ecc1cada52d1e47fef;hb=d337fd88c992c80c68263f66a2d22f3ce2ffefa1;hp=d697142d34a940f639141a717857513451fb60b9;hpb=fb97121f7d0be4408d8e2ed98a2f7b10b852a915;p=16.git

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index d697142d..1afb7bc8 100755
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "16_map.h"
+#include "src/lib/16_map.h"
 
 // Ideally, preprocess json during compilation and read serialized data
 
@@ -33,9 +33,9 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
 }
 
 void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
-	int i, j, k, indent, inner_end;
+	int i, j, k, indent=0, inner_end;
 	bitmap_t bp;
-	char *s;
+	//char *s;
 	i = 0;
 	while(i<count) {
 		if(jsoneq(js, &(t[i]), "layers") == 0) {
@@ -84,7 +84,7 @@ void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
 					map->tiles[k]->debug_text=false;
 					//Fix to load tileset specified.
 					//And move to vrs, probably
-					bp = bitmapLoadPcx("data/ed.pcx");
+					//bp = bitmapLoadPcx("data/ed.pcx");
 					map->tiles[k]->btdata = &bp;
 					k++;
 				}
@@ -151,6 +151,6 @@ int loadmap(char *mn, map_t *map) {
 	free(js);
 	free(tok);
 	fclose(fh);
-	
+
 	return 0;
 }