ok wwww

	modified:   16.exe
	modified:   16.hed
	modified:   maptest.exe
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/scroll.c

diff --git a/16.exe b/16.exe
index 9a8dee24f46cf99a8e5e5fdeaf86e5a40016c93c..d569b88dae7935bf252d3f88073ffd04fbb13323 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/16.hed b/16.hed
index b0e066a7c218a9ce6e114b3fc03cd6d94f567ecb..ae69cb9eb592fe03ed0490a40a2565ee820e53cd 100644 (file)
Binary files a/16.hed and b/16.hed differ

diff --git a/maptest.exe b/maptest.exe
index 331c71474081f7d91d354c6a8e8dc6fa430eeeaa..68bb08b9de6a0027a906af45c1efc0466b7b1c2f 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 9ed8aecac418018e8b1b742d981b43b1dd06fb7e..2a0bc78eb24fcaf4a480cdd6960c7dd536d9c971 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index e3f40b441bbee036658cc132a5a95a89d4a28a17..777de7da29f645b238714f67ea2da658023603aa 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -69,8 +69,8 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv,
                {
 //                     fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
 //                     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->data = _nmalloc(sizeof(byte) * (t+1)->size);
+                       map->tiles = _nmalloc(sizeof(tiles_t));
                        //map->tiles->data = malloc(sizeof(bitmap_t));
                        //fix this to be far~
                        bp = bitmapLoadPcx("data/ed.pcx");
@@ -127,7 +127,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;

diff --git a/src/scroll.c b/src/scroll.c
index d56ce36e6dd5a3cb33b323314556317911fe6270..31cfed72ecbaec0dc397400c6c5e025f992f6a4f 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -80,10 +80,13 @@ void main()
        }*/
 
        /* create the map */
-//0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
-fprintf(stderr, "testing~\n");
+       //printf("Total used @ before map load:                 %zu\n", oldfreemem-GetFreeSize());
+       printf("Total free @ before map load:                   %zu\n", GetFreeSize());
+       printf("Total far free @ before map load:                       %zu\n", GetFarFreeSize());
+       getch();
+       fprintf(stderr, "testing~\n");
        loadmap("data/test.map", &map);
-fprintf(stderr, "yay map loaded~~\n");
+       fprintf(stderr, "yay map loaded~~\n");
 //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());
 //---- initMap(&map);