X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=8e56d67df59e7ee4684e59a426e31391d3cfe173;hb=2f706222157c9d186db8adf361542bb76ba259c6;hp=512a81aff3a0b4400f1b19d81da55b7a41834b7d;hpb=66631d5409667cc804fe7e8622342e9b7d5436b5;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 512a81af..8e56d67d 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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -24,46 +24,27 @@
 #define _16_MAP__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_MAPVAR
-//#define DEBUG_DUMPVARS
+//#define DEBUG_MAPVARS
+//0000++#define DEBUG_OBVARS
 //#define DEBUG_JS
 
-//TODO: 16_mm and 16_ca must handle this
-typedef struct {
-	bitmap_t huge *btdata;		//old
-	planar_buf_t huge *data;	//old
-	word tileHeight, tileWidth;
-	unsigned int rows, cols;
-	#ifdef __DEBUG__
-	boolean debug_text;	//show the value of the tile! wwww
-	byte *debug_data;
-	#endif
-} tiles_t;
-
-//TODO: 16_mm and 16_ca must handle this
-//TODO: add variables from 16_ca
-typedef struct {
-	//long		planestart[3];
-	//unsigned	planelength[3];
-	byte *data;			//TODO: 16_mm and 16_ca must handle this
-	byte * huge *layerdata;	//TODO: 16_mm and 16_ca must handle this
-	tiles_t *tiles;		//TODO: 16_mm and 16_ca must handle this
-	tiles_t * huge *layertile;	//TODO: 16_mm and 16_ca must handle this
-	int width, height;		//this has to be signed!
-	char		name[16];
-} map_t;
+//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);
-int newloadmap(char *mn, map_t *map);
+//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_*/