==== OK i removed all warnings wwww

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

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