X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaptest.c;h=deef4c7c5ac6bda9d6d9a778b62034d299dc8cc9;hb=1f8ab84856824c246e1f66862a302eae41baf123;hp=589d6d11d518a0ed343f3b00e4125eba6b04961e;hpb=308753063de5be458801ae3644faa57afbf54ad2;p=16.git
diff --git a/src/maptest.c b/src/maptest.c
old mode 100644
new mode 100755
index 589d6d11..deef4c7c
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -1,30 +1,97 @@
-#include "src/lib/mapread.h"
-
-#define DUMP
-//#define DUMP_MAP
-
-void
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include "src/lib/16_map.h"
+
+#define DUMP
+#define DUMP_MAP
+
+void
main(int argc, char *argv[])
{
- map_t map;
- short i;
- loadmap("data/test.map", &map);
- #ifdef DUMP
- fprintf(stdout, "map.width= %d\n", map.width);
- fprintf(stdout, "map.height= %d\n", map.height);
- #ifdef DUMP_MAP
- for(i=0; i<(map.width*map.height); i++)
- {
- fprintf(stdout, "%04d[%02d]", i, map.data[i]);
- if(i && !(i%map.width)) fprintf(stdout, "\n");
- }
- fprintf(stdout, "\n");
- #endif
- fprintf(stdout, "&map==%Fp\n", &map);
- fprintf(stdout, "&map.tiles==%Fp\n", map.tiles);
- fprintf(stdout, "&map.width==%Fp\n", map.width);
+ static global_game_variables_t gvar;
+ map_t map;
+#ifdef DUMP
+#ifdef DUMP_MAP
+ short i;
+#ifdef __NEWMAPTILEDATAVARS__
+ word k;
+#endif
+#endif
+#endif
+ char *fmt = "Memory available = %u\n";
+ char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";
+
+ MM_Startup(&gvar);
+ PM_Startup(&gvar);
+ //printf("pmstarted ok\n");
+ //PM_CheckMainMem(&gvar);
+ PM_UnlockMainMem(&gvar);
+ CA_Startup(&gvar);
+
+ fprintf(stderr, fmt, _memavl());
+ fprintf(stderr, fmt0, _memmax());
+ fprintf(stderr, "Size of map var = %u\n", _msize(&(gvar.ca.camap.mapsegs)));
+ //fprintf(stderr, "program always crashes for some reason....\n");
+ getch();
+
+ //loadmap("data/test.map", &map);
+ //newloadmap("data/test.map", &map);
+ CA_loadmap("data/test.map", &map, &gvar);
+ #ifdef DUMP
+ fprintf(stdout, "map.width= %d\n", map.width);
+ fprintf(stdout, "map.height= %d\n", map.height);
+ #ifdef DUMP_MAP
+ //if(map.width*map.height != 1200)
+#ifdef __NEWMAPTILEDATAVARS__
+ for(k=0;k