having the palette in the game code may help. also i added wolf3d's palette for exama...

[16.git] / src / lib / 16_map.h

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 4c6b9a8c6cdb681d1dc0e10d216ac6bdeb96b679..d9333208168757c8822911af8674f28933d74748 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -31,13 +31,12 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
-#ifdef __WATCOMC__\r
 #include "src/lib/16_pm.h"\r
-#endif\r
+\r
 \r
 //#define DEBUG_MAPDATA\r
 //#define DEBUG_MAPVARS\r
-#define DEBUG_OBVARS\r
+//0000++#define DEBUG_OBVARS\r
 //#define DEBUG_JS\r
 \r
 //typedefs moved to 16_tdef.h\r
@@ -45,7 +44,7 @@
 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 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