/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\r
*\r
#define _16_MAP__H_\r
\r
#include "src/lib/16_head.h"\r
+#include "src/lib/16_tdef.h"\r
#include "src/lib/jsmn/jsmn.h"\r
//#include "stdio.h" included in 16_head.h\r
//#include "stdlib.h" included in 16_head.h\r
#include "src/lib/16_vl.h"\r
#include "src/lib/16_ca.h"\r
#include "src/lib/16_mm.h"\r
+#include "src/lib/16_pm.h"\r
\r
-//TODO: 16_mm and 16_ca must handle this\r
-typedef struct {\r
- bitmap_t huge *btdata; //old\r
- planar_buf_t huge *data; //old\r
- word tileHeight;\r
- word tileWidth;\r
- unsigned int rows;\r
- unsigned int cols;\r
- #ifdef __DEBUG__\r
- boolean debug_text; //show the value of the tile! wwww\r
- byte *debug_data;\r
- #endif\r
-} tiles_t;\r
\r
-//TODO: 16_mm and 16_ca must handle this\r
-//TODO: add variables from 16_ca\r
-typedef struct {\r
- //long planestart[3];\r
- //unsigned planelength[3];\r
- byte * huge *data; //TODO: 16_mm and 16_ca must handle this\r
- tiles_t **tiles; //TODO: 16_mm and 16_ca must handle this\r
- unsigned int width, height; //this has to be positive\r
- char name[16];\r
-} map_t;\r
+//#define DEBUG_MAPDATA\r
+//#define DEBUG_MAPVARS\r
+#define DEBUG_OBVARS\r
+//#define DEBUG_JS\r
\r
-int loadmap(char *mn, map_t *map);\r
+//typedefs moved to 16_tdef.h\r
\r
-#endif/*_LIBMAPREAD_H_*/\r
+int jsoneq(const char *json, jsmntok_t *tok, const char *s);\r
+//word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
+//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
+//int newloadmap(char *mn, map_t *map);\r
+int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
+\r
+#endif/*_16_LIB__H_*/\r