WWWWWWWWWWWWwwwwwwwwwwWWWWWWWwwwwWWwwWWwwWwwWww

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 91199e55ae5987c36b59d1f09d17f6cc35bc6d50..3d97e863db93678025adcd2049e9c69f3c2877d5 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -400,18 +400,6 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        jsmn_init(&p);\r
 \r
        file_s = filesize(fh);\r
-       /*js = malloc(file_s);\r
-       if(js == NULL) {\r
-               fprintf(stderr, "malloc(): errno = %d", 2);\r
-               fclose(fh);\r
-               return 3;\r
-       }\r
-       if(fread(js, 1, file_s, fh) != file_s) {\r
-               fprintf(stderr, "Map read error");\r
-               free(js);\r
-               fclose(fh);\r
-               return 1;\r
-       }*/\r
        CA_LoadFile(mn, &MAPBUFINLM, gvar);\r
        tokcount = jsmn_parse(&p, MAPBUFINLM, file_s, NULL, 0);\r
        tok = malloc(tokcount*sizeof(jsmntok_t));\r
@@ -424,9 +412,7 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        }\r
        else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
        extract_map(MAPBUFINLM, tok, tokcount, map);\r
-       //CA_mapdump(MAPBUFINLM, tok, p.toknext, map, 0, gvar);\r
 \r
-       //free(js);\r
        free(tok);\r
        fclose(fh);\r
 \r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 26901678ae24b5a8f604b3b1a0605678a433451c..e8290486aa45f6832bdf4132b23420a666f73045 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -42,8 +42,8 @@
 \r
 int jsoneq(const char *json, jsmntok_t *tok, const char *s);\r
 //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
-int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
-int newloadmap(char *mn, map_t *map);\r
+//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
+//int newloadmap(char *mn, map_t *map);\r
 int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
 \r
 #endif/*_16_LIB__H_*/\r

diff --git a/src/scroll.c b/src/scroll.c
index 5666059730987987339d2b6627024c0a171bd4e4..7c3dd4fe5266f9a193978893db57593bcceb139c 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -55,7 +55,7 @@ void main(int argc, char *argv[])
 \r
        /* create the map */\r
 //     fprintf(stderr, "testing map load~      ");\r
-       loadmap("data/test.map", &map, &gvar);\r
+       CA_loadmap("data/test.map", &map, &gvar);\r
        chkmap(&map, 0);\r
 //     printf("chkmap ok       ");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r