meh did some cleanings and i will work on mapread to mm thingy sometime soon

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index d7e6328ec9729bd79c4e19775f2e0c0139708f86..d3c26c03ff207407212a1f28d1de7d36265f8fc7 100755 (executable)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -22,11 +22,6 @@
 \r
 #ifndef _LIBMAPREAD_H_\r
 #define _LIBMAPREAD_H_\r
-//#include <stdlib.h>\r
-//#include <stdio.h>\r
-#include <string.h>\r
-#include <errno.h>\r
-#include <malloc.h>\r
 \r
 #include "src/lib/jsmn/jsmn.h"\r
 #include "src/lib/modex16.h"\r

diff --git a/src/maptest.c b/src/maptest.c
index 2e6ae7cf84974730af98710316c86215f208a645..d4375e4e22851873e43b5d21d57418c3c45174ad 100755 (executable)
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -19,7 +19,7 @@
  * Fifth Floor, Boston, MA 02110-1301 USA.\r
  *\r
  */\r
-\r
+//TODO: ADD MEMORY MANAGER! WWWW\r
 #include "src/lib/mapread.h"\r
 \r
 #define DUMP\r
@@ -30,6 +30,15 @@ main(int argc, char *argv[])
 {\r
        map_t map;\r
        short i;\r
+       char *fmt = "Memory available = %u\n";\r
+       char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";\r
+\r
+       fprintf(stderr, fmt, _memavl());\r
+       fprintf(stderr, fmt0, _memmax());\r
+       fprintf(stderr, "Size of map var = %u\n", _msize(&map));\r
+       fprintf(stderr, "program always crashes for some reason....");\r
+       getch();\r
+\r
        loadmap("data/test.map", &map);\r
        #ifdef DUMP\r
        fprintf(stdout, "map.width=     %d\n", map.width);\r

diff --git a/src/maptest0.c b/src/maptest0.c
deleted file mode 100755 (executable)
index 9c8cdf0..0000000
--- a/src/maptest0.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
- *\r
- * This file is part of Project 16.\r
- *\r
- * Project 16 is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * Project 16 is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
- * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
- * Fifth Floor, Boston, MA 02110-1301 USA.\r
- *\r
- */\r
-\r
-#include <conio.h>\r
-#include "src/lib/fmapread.h"\r
-\r
-#define DUMP\r
-//#define DUMP_MAP\r
-\r
-void\r
-main(int argc, char *argv[])\r
-{\r
-       map_t map;\r
-       short i;\r
-       char *fmt = "Memory available = %u\n";\r
-       char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";\r
-\r
-       fprintf(stderr, fmt, _memavl());\r
-       fprintf(stderr, fmt0, _memmax());\r
-       fprintf(stderr, "Size of map var = %u\n", _msize(&map));\r
-       fprintf(stderr, "program always crashes for some reason....");\r
-       getch();\r
-\r
-       fprintf(stderr, "loading~\n\n");\r
-       loadmap("data/tes0.map", &map);\r
-       fprintf(stderr, "\nokies~\n");\r
-       #ifdef DUMP\r
-       fprintf(stdout, "map.width=     %d\n", map.width);\r
-       fprintf(stdout, "map.height=    %d\n", map.height);\r
-       #ifdef DUMP_MAP\r
-       for(i=0; i<(map.width*map.height); i++)\r
-       {\r
-               fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
-               if(i && !(i%map.width)) fprintf(stdout, "\n");\r
-       }\r
-       fprintf(stdout, "\n");\r
-       #endif\r
-       fprintf(stdout, "&main()=%Fp\n", *argv[0]);\r
-       fprintf(stdout, "&map==%Fp\n", &map);\r
-       fprintf(stdout, "&map.tiles==%Fp\n", map.tiles);\r
-       fprintf(stdout, "&map.width==%Fp\n", map.width);\r
-       fprintf(stdout, "&map.height==%Fp\n", map.height);\r
-       fprintf(stdout, "&map.data==%Fp\n", map.data);\r
-       #endif\r
-       fprintf(stdout, "okies~\n");\r
-}\r

diff --git a/temp.cmd b/temp.cmd
deleted file mode 100755 (executable)
index b24818d..0000000
--- a/temp.cmd
+++ /dev/null
@@ -1 +0,0 @@
--mh -0 -d1 -wo -isrc/lib/doslib/ -obmilr -oe=24 -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok -DTARGET_MSDOS=16 -DMSDOS=1 -sg -st -of+ -zu -zdf -zff -zgf -k32768 -zk0 -zc -zp8 -zm -zq -q -DDEBUGSERIAL  16.o mapread.o jsmn.o 16_in.o 16_mm.o wcpu.o 16_head.o 16_ca.o 16_dbg.o kitten.o 16_hc.o 16_timer.o src/lib/doslib/hw/cpu/dos86h/cpu.lib src/lib/doslib/hw/dos/dos86h/dos.lib src/lib/doslib/hw/vga/dos86h/vga.lib src/lib/doslib/hw/8250/dos86h/8250.lib gfx.lib -fm=16.mah