X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=48caea541deec4ef143ecba573e211cedd4a8f50;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=4a9ce9bbc903ae95bb26a1c4db8798a0f5ec5c92;hpb=762357f4a3dc3b6e8bf14e6e13e7df292fe2f4b7;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 4a9ce9bb..48caea54 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-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -20,32 +20,31 @@
  *
  */
 
-#ifndef _LIBMAPREAD_H_
-#define _LIBMAPREAD_H_
+#ifndef _16_MAP__H_
+#define _16_MAP__H_
 
-#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"
 
-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	* huge *data;
-	tiles_t **tiles;
-	int width;	//this has to be signed!
-	int height;	//this has to be signed!
-} map_t;
+//#define DEBUG_MAPDATA
+//#define DEBUG_MAPVARS
+//0000++#define DEBUG_OBVARS
+//#define DEBUG_JS
 
-int loadmap(char *mn, map_t *map);
-#endif/*_LIBMAPREAD_H_*/
+//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);
+
+#endif/*_16_LIB__H_*/