X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=f99193b52097e70b7f8b0b697fd0de8377863ef9;hb=eefd43fada99517f9ad662510392e898412ec867;hp=3665a650be4ec6e2931059c5da17e0c7c0ae62ba;hpb=22e2009b7f5d8605fd39b011ea6bba405c7ecc0f;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 3665a650..f99193b5 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -20,32 +20,33 @@
  *
  */
 
-#ifndef _LIBMAPREAD_H_
-#define _LIBMAPREAD_H_
+#ifndef _16_MAP__H_
+#define _16_MAP__H_
+
+#define JSMN_STATIC
 
-#include "jsmn/jsmn.h"
-#include "stdio.h"
-#include "stdlib.h"
-#include "src/lib/modex16.h"
 #include "src/lib/16_head.h"
+#include "src/lib/16_tdef.h"
+#include "src/lib/jsmn/jsmn.h"
+//#include "stdio.h" included in 16_head.h
+//#include "stdlib.h" included in 16_head.h
+#include "src/lib/16_vl.h"
+#include "src/lib/16_ca.h"
+#include "src/lib/16_mm.h"
+#include "src/lib/16_pm.h"
+
+
+//#define DEBUG_MAPDATA
+//#define DEBUG_MAPVARS
+//0000++#define DEBUG_OBVARS
+//#define DEBUG_JS
+
+//typedefs moved to 16_tdef.h
+
+int jsoneq(const char *json, jsmntok_t *tok, const char *s);
+//word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
+//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
+int newloadmap(char *mn, map_t *map);
+int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
 
-typedef struct {
-	bitmap_t huge *btdata;
-	planar_buf_t huge *data;
-	word tileHeight;
-	word tileWidth;
-	unsigned int rows;
-	unsigned int cols;
-	boolean debug_text;	//show the value of the tile! wwww
-	byte *debug_data;
-} tiles_t;
-
-typedef struct {
-	byte	**data;
-	tiles_t **tiles;
-	int width;	//this has to be signed!
-	int height;	//this has to be signed!
-} map_t;
-
-int loadmap(char *mn, map_t *map);
-#endif/*_LIBMAPREAD_H_*/
+#endif/*_16_LIB__H_*/