Initial implementation of DrawDungeon14.hll (GALZOO Island)

Major differences from DrawDungeon.hll are:

- DGN, DTX, TES are loaded from individual files, not from a DLF archive
- 2D map functions are not used
- (unimplemented) Spinning motion of event markers
- (unimplemented) Additional 3D object types (polygon models and roofs)

include/dungeon/dungeon.h

@@ -29,6 +29,12 @@ struct tes;
 struct dungeon_renderer;
 struct dungeon_map;
 
+enum draw_dungeon_version {
+	DRAW_DUNGEON_1,    // Rance VI
+	// DRAW_DUNGEON_2, // Dungeons & Dolls
+	DRAW_DUNGEON_14    // GALZOO Island
+};
+
 struct camera {
 	float pos[3];
 	float angle;
@@ -45,6 +51,7 @@ struct camera {
  */
 
 struct dungeon_context {
+	enum draw_dungeon_version version;
 	int surface;
 	bool loaded;
 	bool draw_enabled;
@@ -57,12 +64,13 @@ struct dungeon_context {
 	GLuint depth_buffer;
 };
 
-struct dungeon_context *dungeon_context_create(int surface);
+struct dungeon_context *dungeon_context_create(enum draw_dungeon_version version, int surface);
 void dungeon_context_free(struct dungeon_context *ctx);
 bool dungeon_load(struct dungeon_context *ctx, int num);
 void dungeon_set_camera(int surface, float x, float y, float z, float angle, float angle_p);
 void dungeon_render(struct dungeon_context *ctx);
 void dungeon_set_walked(int surface, int x, int y, int z, int flag);
+int dungeon_get_walked(int surface, int x, int y, int z);
 int dungeon_calc_conquer(int surface);
 bool dungeon_load_walk_data(int surface, int map, struct page **page);
 bool dungeon_save_walk_data(int surface, int map, struct page **page);

include/dungeon/map.h

@@ -20,7 +20,7 @@
 struct dungeon_context;
 struct dungeon_map;
 
-struct dungeon_map *dungeon_map_create(void);
+struct dungeon_map *dungeon_map_create(enum draw_dungeon_version version);
 void dungeon_map_free(struct dungeon_map *map);
 void dungeon_map_init(struct dungeon_context *ctx);
 void dungeon_map_update_cell(struct dungeon_context *ctx, int x, int y, int z);

include/dungeon/renderer.h

@@ -24,7 +24,7 @@ struct dgn_cell;
 struct dtx;
 struct dungeon_renderer;
 
-struct dungeon_renderer *dungeon_renderer_create(struct dtx *dtx, GLuint *event_textures, int nr_event_textures);
+struct dungeon_renderer *dungeon_renderer_create(enum draw_dungeon_version version, struct dtx *dtx, GLuint *event_textures, int nr_event_textures);
 void dungeon_renderer_free(struct dungeon_renderer *r);
 void dungeon_renderer_render(struct dungeon_renderer *r, struct dgn_cell **cells, int nr_cells, mat4 view_transform, mat4 proj_transform);
 

src/dungeon/dungeon.c

@@ -25,6 +25,7 @@
 #include "system4/archive.h"
 #include "system4/cg.h"
 #include "system4/dlf.h"
+#include "system4/file.h"
 
 #include "dungeon/dgn.h"
 #include "dungeon/dtx.h"
@@ -43,9 +44,10 @@
 #define M_PI (3.14159265358979323846)
 #endif
 
-struct dungeon_context *dungeon_context_create(int surface)
+struct dungeon_context *dungeon_context_create(enum draw_dungeon_version version, int surface)
 {
 	struct dungeon_context *ctx = xcalloc(1, sizeof(struct dungeon_context));
+	ctx->version = version;
 	ctx->surface = surface;
 	struct sact_sprite *sp = sact_get_sprite(ctx->surface);
 	if (!sp)
@@ -59,7 +61,7 @@ struct dungeon_context *dungeon_context_create(int surface)
 	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, texture->w, texture->h);
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 
-	ctx->map = dungeon_map_create();
+	ctx->map = dungeon_map_create(version);
 	return ctx;
 }
 
@@ -76,7 +78,8 @@ void dungeon_context_free(struct dungeon_context *ctx)
 		dungeon_renderer_free(ctx->renderer);
 
 	glDeleteRenderbuffers(1, &ctx->depth_buffer);
-	dungeon_map_free(ctx->map);
+	if (ctx->map)
+		dungeon_map_free(ctx->map);
 
 	free(ctx);
 }
@@ -127,34 +130,65 @@ bool dungeon_load(struct dungeon_context *ctx, int num)
 	if (ctx->loaded)
 		VM_ERROR("Dungeon is already loaded");
 
-	char *path = gamedir_path("Data/DungeonData.dlf");
-	int error = ARCHIVE_SUCCESS;
-	struct archive *dlf = (struct archive *)dlf_open(path, ARCHIVE_MMAP, &error);
-	if (error == ARCHIVE_FILE_ERROR) {
-		WARNING("dlf_open(\"%s\"): %s", path, strerror(errno));
-	} else if (error == ARCHIVE_BAD_ARCHIVE_ERROR) {
-		WARNING("dlf_open(\"%s\"): invalid .dlf file", path);
-	}
-	free(path);
-	if (!dlf)
-		return false;
+	if (ctx->version == DRAW_DUNGEON_1) {
+		char *path = gamedir_path("Data/DungeonData.dlf");
+		int error = ARCHIVE_SUCCESS;
+		struct archive *dlf = (struct archive *)dlf_open(path, ARCHIVE_MMAP, &error);
+		if (error == ARCHIVE_FILE_ERROR) {
+			WARNING("dlf_open(\"%s\"): %s", path, strerror(errno));
+		} else if (error == ARCHIVE_BAD_ARCHIVE_ERROR) {
+			WARNING("dlf_open(\"%s\"): invalid .dlf file", path);
+		}
+		free(path);
+		if (!dlf)
+			return false;
 
-	struct archive_data *dgn = archive_get(dlf, num * 3);
-	if (dgn) {
-		ctx->dgn = dgn_parse(dgn->data, dgn->size);
-		archive_free_data(dgn);
+		struct archive_data *dgn = archive_get(dlf, num * 3);
+		if (dgn) {
+			ctx->dgn = dgn_parse(dgn->data, dgn->size);
+			archive_free_data(dgn);
+		}
+		struct archive_data *dtx = archive_get(dlf, num * 3 + 1);
+		if (dtx) {
+			ctx->dtx = dtx_parse(dtx->data, dtx->size);
+			archive_free_data(dtx);
+		}
+		struct archive_data *tes = archive_get(dlf, num * 3 + 2);
+		if (tes) {
+			ctx->tes = tes_parse(tes->data, tes->size);
+			archive_free_data(tes);
+		}
+		archive_free(dlf);
+	} else if (ctx->version == DRAW_DUNGEON_14) {
+		char buf[100];
+		sprintf(buf, "Data/map%02d.dgn", num);
+		char *path = gamedir_path(buf);
+
+		size_t len;
+		uint8_t *dgn = file_read(path, &len);
+		if (dgn) {
+			ctx->dgn = dgn_parse(dgn, len);
+			free(dgn);
+		}
+
+		strcpy(path + strlen(path) - 3, "dtx");
+		uint8_t *dtx = file_read(path, &len);
+		if (dtx) {
+			ctx->dtx = dtx_parse(dtx, len);
+			free(dtx);
+		}
+
+		strcpy(path + strlen(path) - 3, "tes");
+		uint8_t *tes = file_read(path, &len);
+		if (tes) {
+			ctx->tes = tes_parse(tes, len);
+			free(tes);
+		}
+		free(path);
+	} else {
+		ERROR("Invalid DrawDungeon version %d", ctx->version);
 	}
-	struct archive_data *dtx = archive_get(dlf, num * 3 + 1);
-	if (dtx) {
-		ctx->dtx = dtx_parse(dtx->data, dtx->size);
-		archive_free_data(dtx);
-	}
-	struct archive_data *tes = archive_get(dlf, num * 3 + 2);
-	if (tes) {
-		ctx->tes = tes_parse(tes->data, tes->size);
-		archive_free_data(tes);
-	}
-	archive_free(dlf);
+
 	if (!ctx->dgn || !ctx->dtx) {
 		WARNING("Cannot load dungeon %d", num);
 		return false;
@@ -165,7 +199,7 @@ bool dungeon_load(struct dungeon_context *ctx, int num)
 	if (!event_textures)
 		return false;
 
-	ctx->renderer = dungeon_renderer_create(ctx->dtx, event_textures, nr_event_textures);
+	ctx->renderer = dungeon_renderer_create(ctx->version, ctx->dtx, event_textures, nr_event_textures);
 
 	dungeon_map_init(ctx);
 
@@ -257,14 +291,24 @@ void dungeon_set_walked(int surface, int x, int y, int z, int flag)
 		return;
 	dgn_cell_at(ctx->dgn, x, y, z)->walked = 1;
 	dungeon_map_reveal(ctx, x, y, z);
-	if (x > 0)
-		neighbor_reveal(ctx, x - 1, y, z);
-	if (x + 1u < ctx->dgn->size_x)
-		neighbor_reveal(ctx, x + 1, y, z);
-	if (z > 0)
-		neighbor_reveal(ctx, x, y, z - 1);
-	if (z + 1u < ctx->dgn->size_z)
-		neighbor_reveal(ctx, x, y, z + 1);
+	if (ctx->version == DRAW_DUNGEON_1) {
+		if (x > 0)
+			neighbor_reveal(ctx, x - 1, y, z);
+		if (x + 1u < ctx->dgn->size_x)
+			neighbor_reveal(ctx, x + 1, y, z);
+		if (z > 0)
+			neighbor_reveal(ctx, x, y, z - 1);
+		if (z + 1u < ctx->dgn->size_z)
+			neighbor_reveal(ctx, x, y, z + 1);
+	}
+}
+
+int dungeon_get_walked(int surface, int x, int y, int z)
+{
+	struct dungeon_context *ctx = dungeon_get_context(surface);
+	if (!ctx || !ctx->dgn)
+		return 0;
+	return dgn_cell_at(ctx->dgn, x, y, z)->walked;
 }
 
 int dungeon_calc_conquer(int surface)
@@ -276,7 +320,7 @@ int dungeon_calc_conquer(int surface)
 }
 
 /*
- * WalkData serialization format (in Rance VI):
+ * WalkData serialization format:
  *
  * struct WalkData {
  *     int version;  // zero

src/dungeon/map.c

@@ -70,8 +70,11 @@ static Point texture_pos(struct dungeon_context *ctx, int x, int z)
 	};
 }
 
-struct dungeon_map *dungeon_map_create(void)
+struct dungeon_map *dungeon_map_create(enum draw_dungeon_version version)
 {
+	if (version == DRAW_DUNGEON_14)
+		return NULL;  // GALZOO does not use DrawDungeon's 2D map functions.
+
 	struct dungeon_map *map = xcalloc(1, sizeof(struct dungeon_map));
 	map->small_map_floor = -1;
 	map->large_map_floor = -1;
@@ -90,6 +93,8 @@ void dungeon_map_init(struct dungeon_context *ctx)
 {
 	struct dungeon_map *map = ctx->map;
 	struct dgn *dgn = ctx->dgn;
+	if (!map)
+		return;
 
 	map->textures = xcalloc(dgn->size_y, sizeof(struct texture));
 	map->nr_textures = dgn->size_y;
@@ -128,6 +133,8 @@ void dungeon_map_init(struct dungeon_context *ctx)
 
 void dungeon_map_reveal(struct dungeon_context *ctx, int x, int y, int z)
 {
+	if (!ctx->map)
+		return;
 	struct texture *dst = &ctx->map->textures[y];
 	Point pos = texture_pos(ctx, x, z);
 	gfx_fill_amap(dst, pos.x, pos.y, CS, CS, 255);
@@ -154,6 +161,8 @@ static void draw_symbol(struct dungeon_context *ctx, struct texture *dst, int x,
 
 void dungeon_map_update_cell(struct dungeon_context *ctx, int dgn_x, int dgn_y, int dgn_z)
 {
+	if (!ctx->map)
+		return;
 	struct dgn_cell *cell = dgn_cell_at(ctx->dgn, dgn_x, dgn_y, dgn_z);
 	struct texture *dst = &ctx->map->textures[dgn_y];
 	Point pos = texture_pos(ctx, dgn_x, dgn_z);
@@ -238,7 +247,7 @@ static int player_symbol(struct dungeon_context *ctx)
 void dungeon_map_draw(int surface, int sprite)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx)
+	if (!ctx || !ctx->map)
 		return;
 	struct sact_sprite *sp = sact_get_sprite(sprite);
 	if (!sp)
@@ -270,7 +279,7 @@ void dungeon_map_draw(int surface, int sprite)
 void dungeon_map_draw_lmap(int surface, int sprite)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx)
+	if (!ctx || !ctx->map)
 		return;
 	struct sact_sprite *sp = sact_get_sprite(sprite);
 	if (!sp)
@@ -307,7 +316,7 @@ static void redraw_event_symbols(struct dungeon_context *ctx)
 void dungeon_map_set_radar(int surface, int flag)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx || ctx->map->radar == flag)
+	if (!ctx || !ctx->map || ctx->map->radar == flag)
 		return;
 	ctx->map->radar = flag;
 	redraw_event_symbols(ctx);
@@ -316,7 +325,7 @@ void dungeon_map_set_radar(int surface, int flag)
 void dungeon_map_set_all_view(int surface, int flag)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx || ctx->map->all_visible == flag)
+	if (!ctx || !ctx->map || ctx->map->all_visible == flag)
 		return;
 	ctx->map->all_visible = flag;
 	redraw_event_symbols(ctx);
@@ -325,7 +334,7 @@ void dungeon_map_set_all_view(int surface, int flag)
 void dungeon_map_set_cg(int surface, int index, int sprite)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx)
+	if (!ctx || !ctx->map)
 		return;
 	if (index < 0 || index >= NR_SYMBOLS)
 		VM_ERROR("DrawDungeon.SetMapCG: index %d is out of bounds", index);
@@ -335,7 +344,7 @@ void dungeon_map_set_cg(int surface, int index, int sprite)
 void dungeon_map_set_small_map_floor(int surface, int floor)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx)
+	if (!ctx || !ctx->map)
 		return;
 	ctx->map->small_map_floor = floor;
 }
@@ -343,7 +352,7 @@ void dungeon_map_set_small_map_floor(int surface, int floor)
 void dungeon_map_set_large_map_floor(int surface, int floor)
 {
 	struct dungeon_context *ctx = dungeon_get_context(surface);
-	if (!ctx)
+	if (!ctx || !ctx->map)
 		return;
 	ctx->map->large_map_floor = floor;
 }

src/dungeon/renderer.c

@@ -22,6 +22,7 @@
 #include "system4.h"
 #include "system4/cg.h"
 
+#include "dungeon/dungeon.h"
 #include "dungeon/dgn.h"
 #include "dungeon/dtx.h"
 #include "dungeon/renderer.h"
@@ -35,31 +36,40 @@ struct marker_info {
 	int floor_marker;
 };
 
-enum rance6_floor_marker {
-	MAGIC_CIRCLE = 1,
-	RED_OCTAGRAM = 63,
+enum floor_marker {
+	// Rance VI
+	R6_MAGIC_CIRCLE = 1,
+	R6_RED_OCTAGRAM = 63,
+	// GALZOO Island
+	GZ_MAGIC_CIRCLE = 0,
 };
 
 static const struct marker_info rance6_marker_info[] = {
-	{ 11, 41,  3, MAGIC_CIRCLE},  // treasure chest
-	{ 12, 51,  7, RED_OCTAGRAM},  // enemy
-	{ 14,  8,  5, MAGIC_CIRCLE},  // green star
-	{ 15, 21, 10, MAGIC_CIRCLE},  // heart
-	{ 16, 45,  5, MAGIC_CIRCLE},  // BP cross
-	{ 17, 58,  5, MAGIC_CIRCLE},  // exit
-	{ 18, 31, 10, MAGIC_CIRCLE},  // teleporter
-	{140, 13,  5, RED_OCTAGRAM},  // red star
+	{ 11, 41,  3, R6_MAGIC_CIRCLE},  // treasure chest
+	{ 12, 51,  7, R6_RED_OCTAGRAM},  // enemy
+	{ 14,  8,  5, R6_MAGIC_CIRCLE},  // green star
+	{ 15, 21, 10, R6_MAGIC_CIRCLE},  // heart
+	{ 16, 45,  5, R6_MAGIC_CIRCLE},  // BP cross
+	{ 17, 58,  5, R6_MAGIC_CIRCLE},  // exit
+	{ 18, 31, 10, R6_MAGIC_CIRCLE},  // teleporter
+	{140, 13,  5, R6_RED_OCTAGRAM},  // red star
 	{0},
 };
 
-static const struct marker_info *get_marker_info(int event_type)
-{
-	for (const struct marker_info *info = rance6_marker_info; info->event_type; info++) {
-		if (info->event_type == event_type)
-			return info;
-	}
-	return NULL;
-}
+static const struct marker_info galzoo_marker_info[] = {
+	{11, 1, 1, GZ_MAGIC_CIRCLE},  // item
+	{12, 2, 1, GZ_MAGIC_CIRCLE},  // enemy
+	{14, 3, 1, GZ_MAGIC_CIRCLE},  // star
+	{15, 4, 1, GZ_MAGIC_CIRCLE},  // heart
+	{17, 5, 1, GZ_MAGIC_CIRCLE},  // exit
+	{18, 6, 1, GZ_MAGIC_CIRCLE},  // teleporter
+	{0},
+};
+
+static const struct marker_info *marker_tables[] = {
+	[DRAW_DUNGEON_1] = rance6_marker_info,
+	[DRAW_DUNGEON_14] = galzoo_marker_info
+};
 
 struct geometry;
 struct material;
@@ -84,10 +94,20 @@ struct dungeon_renderer {
 
 	GLuint *event_textures;
 	int nr_event_textures;
+	const struct marker_info *marker_table;
 
 	struct skybox *skybox;
 };
 
+static const struct marker_info *get_marker_info(struct dungeon_renderer *r, int event_type)
+{
+	for (const struct marker_info *info = r->marker_table; info->event_type; info++) {
+		if (info->event_type == event_type)
+			return info;
+	}
+	return NULL;
+}
+
 struct vertex {
 	GLfloat x, y, z, u, v;
 };
@@ -213,7 +233,7 @@ static struct material *get_material(struct dungeon_renderer *r, int type, int i
 	return m;
 }
 
-struct dungeon_renderer *dungeon_renderer_create(struct dtx *dtx, GLuint *event_textures, int nr_event_textures)
+struct dungeon_renderer *dungeon_renderer_create(enum draw_dungeon_version version, struct dtx *dtx, GLuint *event_textures, int nr_event_textures)
 {
 	struct dungeon_renderer *r = xcalloc(1, sizeof(struct dungeon_renderer));
 
@@ -240,6 +260,7 @@ struct dungeon_renderer *dungeon_renderer_create(struct dtx *dtx, GLuint *event_
 
 	r->event_textures = event_textures;
 	r->nr_event_textures = nr_event_textures;
+	r->marker_table = marker_tables[version];
 
 	r->skybox = skybox_create(dtx);
 
@@ -482,7 +503,7 @@ static void draw_cell(struct dungeon_renderer *r, struct dgn_cell *cell, bool re
 		}
 	}
 	if (cell->floor_event && !render_opaque) {
-		const struct marker_info *info = get_marker_info(cell->floor_event);
+		const struct marker_info *info = get_marker_info(r, cell->floor_event);
 		if (info) {
 			uint32_t t = SDL_GetTicks();
 			draw_floor_marker(r, info, x, y, z, t);

src/ffi.c

@@ -291,6 +291,7 @@ extern struct static_library lib_Confirm2;
 extern struct static_library lib_CrayfishLogViewer;
 extern struct static_library lib_DataFile;
 extern struct static_library lib_DrawDungeon;
+extern struct static_library lib_DrawDungeon14;
 extern struct static_library lib_DrawGraph;
 extern struct static_library lib_DrawMovie2;
 extern struct static_library lib_DrawPluginManager;
@@ -339,6 +340,7 @@ static struct static_library *static_libraries[] = {
 	&lib_CrayfishLogViewer,
 	&lib_DataFile,
 	&lib_DrawDungeon,
+	&lib_DrawDungeon14,
 	&lib_DrawGraph,
 	&lib_DrawMovie2,
 	&lib_DrawPluginManager,

src/hll/DrawDungeon.c

@@ -28,6 +28,16 @@
 
 static struct dungeon_context *current_context = NULL;
 
+static int dungeon_init(enum draw_dungeon_version version, int surface)
+{
+	if (current_context)
+		VM_ERROR("Dungeon is already associated with surface %d", current_context->surface);
+	if (surface < 0)
+		return 0;
+	current_context = dungeon_context_create(version, surface);
+	return 1;
+}
+
 struct dungeon_context *dungeon_get_context(int surface)
 {
 	if (!current_context || surface != current_context->surface)
@@ -49,14 +59,22 @@ static struct dgn_cell *dungeon_get_cell(int surface, int x, int y, int z)
 	return dgn_cell_at(ctx->dgn, x, y, z);
 }
 
+static void DrawDungeon_ModuleFini(void)
+{
+	if (current_context) {
+		dungeon_context_free(current_context);
+		current_context = NULL;
+	}
+}
+
 static int DrawDungeon_Init(int surface)
 {
-	if (current_context)
-		VM_ERROR("Dungeon is already associated with surface %d", current_context->surface);
-	if (surface < 0)
-		return 0;
-	current_context = dungeon_context_create(surface);
-	return 1;
+	return dungeon_init(DRAW_DUNGEON_1, surface);
+}
+
+static int DrawDungeon14_Init(int surface)
+{
+	return dungeon_init(DRAW_DUNGEON_14, surface);
 }
 
 static void DrawDungeon_Release(int surface)
@@ -261,123 +279,143 @@ static int DrawDungeon_GetTexSound(int surface, int type, int num)
 HLL_QUIET_UNIMPLEMENTED( , void, DrawDungeon, StopTimer, void);
 HLL_QUIET_UNIMPLEMENTED( , void, DrawDungeon, RestartTimer, void);
 
+#define DRAW_DUNGEON_EXPORTS \
+	HLL_EXPORT(_ModuleFini, DrawDungeon_ModuleFini), \
+	HLL_EXPORT(Release, DrawDungeon_Release), \
+	HLL_EXPORT(SetDrawFlag, DrawDungeon_SetDrawFlag), \
+	HLL_EXPORT(BeginLoad, DrawDungeon_BeginLoad), \
+	HLL_EXPORT(IsLoading, DrawDungeon_IsLoading), \
+	HLL_EXPORT(IsSucceededLoading, DrawDungeon_IsSucceededLoading), \
+	HLL_TODO_EXPORT(GetLoadingPercent, DrawDungeon_GetLoadingPercent), \
+	HLL_TODO_EXPORT(LoadFromFile, DrawDungeon_LoadFromFile), \
+	HLL_TODO_EXPORT(LoadTexture, DrawDungeon_LoadTexture), \
+	HLL_TODO_EXPORT(LoadEventTexture, DrawDungeon_LoadEventTexture), \
+	HLL_EXPORT(GetMapX, DrawDungeon_GetMapX), \
+	HLL_EXPORT(GetMapY, DrawDungeon_GetMapY), \
+	HLL_EXPORT(GetMapZ, DrawDungeon_GetMapZ), \
+	HLL_EXPORT(SetCamera, dungeon_set_camera), \
+	HLL_EXPORT(IsInMap, DrawDungeon_IsInMap), \
+	HLL_EXPORT(IsFloor, DrawDungeon_IsFloor), \
+	HLL_TODO_EXPORT(IsFloorFillTexture, DrawDungeon_IsFloorFillTexture), \
+	HLL_EXPORT(IsStair, DrawDungeon_IsStair), \
+	HLL_EXPORT(IsStairN, DrawDungeon_IsStairN), \
+	HLL_EXPORT(IsStairW, DrawDungeon_IsStairW), \
+	HLL_EXPORT(IsStairS, DrawDungeon_IsStairS), \
+	HLL_EXPORT(IsStairE, DrawDungeon_IsStairE), \
+	HLL_EXPORT(IsWallN, DrawDungeon_IsWallN), \
+	HLL_EXPORT(IsWallW, DrawDungeon_IsWallW), \
+	HLL_EXPORT(IsWallS, DrawDungeon_IsWallS), \
+	HLL_EXPORT(IsWallE, DrawDungeon_IsWallE), \
+	HLL_EXPORT(IsDoorN, DrawDungeon_IsDoorN), \
+	HLL_EXPORT(IsDoorW, DrawDungeon_IsDoorW), \
+	HLL_EXPORT(IsDoorS, DrawDungeon_IsDoorS), \
+	HLL_EXPORT(IsDoorE, DrawDungeon_IsDoorE), \
+	HLL_EXPORT(IsEnter, DrawDungeon_IsEnter), \
+	HLL_EXPORT(IsEnterN, DrawDungeon_IsEnterN), \
+	HLL_EXPORT(IsEnterW, DrawDungeon_IsEnterW), \
+	HLL_EXPORT(IsEnterS, DrawDungeon_IsEnterS), \
+	HLL_EXPORT(IsEnterE, DrawDungeon_IsEnterE), \
+	HLL_EXPORT(GetEvFloor, DrawDungeon_GetEvFloor), \
+	HLL_EXPORT(GetEvWallN, DrawDungeon_GetEvWallN), \
+	HLL_EXPORT(GetEvWallW, DrawDungeon_GetEvWallW), \
+	HLL_EXPORT(GetEvWallS, DrawDungeon_GetEvWallS), \
+	HLL_EXPORT(GetEvWallE, DrawDungeon_GetEvWallE), \
+	HLL_EXPORT(GetEvFloor2, DrawDungeon_GetEvFloor2), \
+	HLL_EXPORT(GetEvWallN2, DrawDungeon_GetEvWallN2), \
+	HLL_EXPORT(GetEvWallW2, DrawDungeon_GetEvWallW2), \
+	HLL_EXPORT(GetEvWallS2, DrawDungeon_GetEvWallS2), \
+	HLL_EXPORT(GetEvWallE2, DrawDungeon_GetEvWallE2), \
+	HLL_EXPORT(GetTexFloor, DrawDungeon_GetTexFloor), \
+	HLL_EXPORT(GetTexCeiling, DrawDungeon_GetTexCeiling), \
+	HLL_EXPORT(GetTexWallN, DrawDungeon_GetTexWallN), \
+	HLL_EXPORT(GetTexWallW, DrawDungeon_GetTexWallW), \
+	HLL_EXPORT(GetTexWallS, DrawDungeon_GetTexWallS), \
+	HLL_EXPORT(GetTexWallE, DrawDungeon_GetTexWallE), \
+	HLL_EXPORT(GetTexDoorN, DrawDungeon_GetTexDoorN), \
+	HLL_EXPORT(GetTexDoorW, DrawDungeon_GetTexDoorW), \
+	HLL_EXPORT(GetTexDoorS, DrawDungeon_GetTexDoorS), \
+	HLL_EXPORT(GetTexDoorE, DrawDungeon_GetTexDoorE), \
+	HLL_EXPORT(GetTexStair, DrawDungeon_GetTexStair), \
+	HLL_EXPORT(GetBattleBack, DrawDungeon_GetBattleBack), \
+	HLL_EXPORT(SetDoorNAngle, DrawDungeon_SetDoorNAngle), \
+	HLL_EXPORT(SetDoorWAngle, DrawDungeon_SetDoorWAngle), \
+	HLL_EXPORT(SetDoorSAngle, DrawDungeon_SetDoorSAngle), \
+	HLL_EXPORT(SetDoorEAngle, DrawDungeon_SetDoorEAngle), \
+	HLL_EXPORT(SetEvFloor, DrawDungeon_SetEvFloor), \
+	HLL_EXPORT(SetEvWallN, DrawDungeon_SetEvWallN), \
+	HLL_EXPORT(SetEvWallW, DrawDungeon_SetEvWallW), \
+	HLL_EXPORT(SetEvWallS, DrawDungeon_SetEvWallS), \
+	HLL_EXPORT(SetEvWallE, DrawDungeon_SetEvWallE), \
+	HLL_EXPORT(SetEvFloor2, DrawDungeon_SetEvFloor2), \
+	HLL_EXPORT(SetEvWallN2, DrawDungeon_SetEvWallN2), \
+	HLL_EXPORT(SetEvWallW2, DrawDungeon_SetEvWallW2), \
+	HLL_EXPORT(SetEvWallS2, DrawDungeon_SetEvWallS2), \
+	HLL_EXPORT(SetEvWallE2, DrawDungeon_SetEvWallE2), \
+	HLL_TODO_EXPORT(SetEvMag, DrawDungeon_SetEvMag), \
+	HLL_EXPORT(SetEvRate, DrawDungeon_SetEvRate), \
+	HLL_EXPORT(SetEnter, DrawDungeon_SetEnter), \
+	HLL_EXPORT(SetEnterN, DrawDungeon_SetEnterN), \
+	HLL_EXPORT(SetEnterW, DrawDungeon_SetEnterW), \
+	HLL_EXPORT(SetEnterS, DrawDungeon_SetEnterS), \
+	HLL_EXPORT(SetEnterE, DrawDungeon_SetEnterE), \
+	HLL_EXPORT(SetTexFloor, DrawDungeon_SetTexFloor), \
+	HLL_EXPORT(SetTexCeiling, DrawDungeon_SetTexCeiling), \
+	HLL_EXPORT(SetTexWallN, DrawDungeon_SetTexWallN), \
+	HLL_EXPORT(SetTexWallW, DrawDungeon_SetTexWallW), \
+	HLL_EXPORT(SetTexWallS, DrawDungeon_SetTexWallS), \
+	HLL_EXPORT(SetTexWallE, DrawDungeon_SetTexWallE), \
+	HLL_EXPORT(SetTexDoorN, DrawDungeon_SetTexDoorN), \
+	HLL_EXPORT(SetTexDoorW, DrawDungeon_SetTexDoorW), \
+	HLL_EXPORT(SetTexDoorS, DrawDungeon_SetTexDoorS), \
+	HLL_EXPORT(SetTexDoorE, DrawDungeon_SetTexDoorE), \
+	HLL_TODO_EXPORT(SetSkyTextureSet, DrawDungeon_SetSkyTextureSet), \
+	HLL_EXPORT(DrawMap, dungeon_map_draw), \
+	HLL_EXPORT(SetMapAllViewFlag, dungeon_map_set_all_view), \
+	HLL_EXPORT(SetDrawMapFloor, dungeon_map_set_small_map_floor), \
+	HLL_EXPORT(DrawLMap, dungeon_map_draw_lmap), \
+	HLL_EXPORT(SetMapCG, dungeon_map_set_cg), \
+	HLL_EXPORT(SetDrawLMapFloor, dungeon_map_set_large_map_floor), \
+	HLL_EXPORT(SetDrawMapRadar, dungeon_map_set_radar), \
+	HLL_EXPORT(SetDrawHalfFlag, DrawDungeon_SetDrawHalfFlag), \
+	HLL_EXPORT(GetDrawHalfFlag, DrawDungeon_GetDrawHalfFlag), \
+	HLL_EXPORT(SetWalked, dungeon_set_walked), \
+	HLL_TODO_EXPORT(SetWalkedAll, DrawDungeon_SetWalkedAll), \
+	HLL_TODO_EXPORT(CalcNumofFloor, DrawDungeon_CalcNumofFloor), \
+	HLL_TODO_EXPORT(CalcNumofWalk, DrawDungeon_CalcNumofWalk), \
+	HLL_TODO_EXPORT(CalcNumofWalk2, DrawDungeon_CalcNumofWalk2), \
+	HLL_EXPORT(CalcConquer, dungeon_calc_conquer), \
+	HLL_EXPORT(SetInterlaceMode, DrawDungeon_SetInterlaceMode), \
+	HLL_EXPORT(SetDirect3DMode, DrawDungeon_SetDirect3DMode), \
+	HLL_EXPORT(SaveDrawSettingFlag, DrawDungeon_SaveDrawSettingFlag), \
+	HLL_EXPORT(GetDrawSettingFlag, DrawDungeon_GetDrawSettingFlag), \
+	HLL_EXPORT(IsDrawSettingFile, DrawDungeon_IsDrawSettingFile), \
+	HLL_EXPORT(DeleteDrawSettingFile, DrawDungeon_DeleteDrawSettingFile), \
+	HLL_EXPORT(IsSSEFlag, DrawDungeon_IsSSEFlag), \
+	HLL_EXPORT(SetSSEFlag, DrawDungeon_SetSSEFlag), \
+	HLL_EXPORT(IsPVSData, DrawDungeon_IsPVSData), \
+	HLL_EXPORT(GetTexSound, DrawDungeon_GetTexSound), \
+	HLL_EXPORT(StopTimer, DrawDungeon_StopTimer), \
+	HLL_EXPORT(RestartTimer, DrawDungeon_RestartTimer), \
+	HLL_EXPORT(LoadWalkData, dungeon_load_walk_data), \
+	HLL_EXPORT(SaveWalkData, dungeon_save_walk_data)
+
 HLL_LIBRARY(DrawDungeon,
-			HLL_EXPORT(Init, DrawDungeon_Init),
-			HLL_EXPORT(Release, DrawDungeon_Release),
-			HLL_EXPORT(SetDrawFlag, DrawDungeon_SetDrawFlag),
-			HLL_EXPORT(BeginLoad, DrawDungeon_BeginLoad),
-			HLL_EXPORT(IsLoading, DrawDungeon_IsLoading),
-			HLL_EXPORT(IsSucceededLoading, DrawDungeon_IsSucceededLoading),
-			HLL_TODO_EXPORT(GetLoadingPercent, DrawDungeon_GetLoadingPercent),
-			HLL_TODO_EXPORT(LoadFromFile, DrawDungeon_LoadFromFile),
-			HLL_TODO_EXPORT(LoadTexture, DrawDungeon_LoadTexture),
-			HLL_TODO_EXPORT(LoadEventTexture, DrawDungeon_LoadEventTexture),
-			HLL_EXPORT(GetMapX, DrawDungeon_GetMapX),
-			HLL_EXPORT(GetMapY, DrawDungeon_GetMapY),
-			HLL_EXPORT(GetMapZ, DrawDungeon_GetMapZ),
-			HLL_EXPORT(SetCamera, dungeon_set_camera),
-			HLL_EXPORT(IsInMap, DrawDungeon_IsInMap),
-			HLL_EXPORT(IsFloor, DrawDungeon_IsFloor),
-			HLL_TODO_EXPORT(IsFloorFillTexture, DrawDungeon_IsFloorFillTexture),
-			HLL_EXPORT(IsStair, DrawDungeon_IsStair),
-			HLL_EXPORT(IsStairN, DrawDungeon_IsStairN),
-			HLL_EXPORT(IsStairW, DrawDungeon_IsStairW),
-			HLL_EXPORT(IsStairS, DrawDungeon_IsStairS),
-			HLL_EXPORT(IsStairE, DrawDungeon_IsStairE),
-			HLL_EXPORT(IsWallN, DrawDungeon_IsWallN),
-			HLL_EXPORT(IsWallW, DrawDungeon_IsWallW),
-			HLL_EXPORT(IsWallS, DrawDungeon_IsWallS),
-			HLL_EXPORT(IsWallE, DrawDungeon_IsWallE),
-			HLL_EXPORT(IsDoorN, DrawDungeon_IsDoorN),
-			HLL_EXPORT(IsDoorW, DrawDungeon_IsDoorW),
-			HLL_EXPORT(IsDoorS, DrawDungeon_IsDoorS),
-			HLL_EXPORT(IsDoorE, DrawDungeon_IsDoorE),
-			HLL_EXPORT(IsEnter, DrawDungeon_IsEnter),
-			HLL_EXPORT(IsEnterN, DrawDungeon_IsEnterN),
-			HLL_EXPORT(IsEnterW, DrawDungeon_IsEnterW),
-			HLL_EXPORT(IsEnterS, DrawDungeon_IsEnterS),
-			HLL_EXPORT(IsEnterE, DrawDungeon_IsEnterE),
-			HLL_EXPORT(GetEvFloor, DrawDungeon_GetEvFloor),
-			HLL_EXPORT(GetEvWallN, DrawDungeon_GetEvWallN),
-			HLL_EXPORT(GetEvWallW, DrawDungeon_GetEvWallW),
-			HLL_EXPORT(GetEvWallS, DrawDungeon_GetEvWallS),
-			HLL_EXPORT(GetEvWallE, DrawDungeon_GetEvWallE),
-			HLL_EXPORT(GetEvFloor2, DrawDungeon_GetEvFloor2),
-			HLL_EXPORT(GetEvWallN2, DrawDungeon_GetEvWallN2),
-			HLL_EXPORT(GetEvWallW2, DrawDungeon_GetEvWallW2),
-			HLL_EXPORT(GetEvWallS2, DrawDungeon_GetEvWallS2),
-			HLL_EXPORT(GetEvWallE2, DrawDungeon_GetEvWallE2),
-			HLL_EXPORT(GetTexFloor, DrawDungeon_GetTexFloor),
-			HLL_EXPORT(GetTexCeiling, DrawDungeon_GetTexCeiling),
-			HLL_EXPORT(GetTexWallN, DrawDungeon_GetTexWallN),
-			HLL_EXPORT(GetTexWallW, DrawDungeon_GetTexWallW),
-			HLL_EXPORT(GetTexWallS, DrawDungeon_GetTexWallS),
-			HLL_EXPORT(GetTexWallE, DrawDungeon_GetTexWallE),
-			HLL_EXPORT(GetTexDoorN, DrawDungeon_GetTexDoorN),
-			HLL_EXPORT(GetTexDoorW, DrawDungeon_GetTexDoorW),
-			HLL_EXPORT(GetTexDoorS, DrawDungeon_GetTexDoorS),
-			HLL_EXPORT(GetTexDoorE, DrawDungeon_GetTexDoorE),
-			HLL_EXPORT(GetTexStair, DrawDungeon_GetTexStair),
-			HLL_EXPORT(GetBattleBack, DrawDungeon_GetBattleBack),
-			HLL_EXPORT(SetDoorNAngle, DrawDungeon_SetDoorNAngle),
-			HLL_EXPORT(SetDoorWAngle, DrawDungeon_SetDoorWAngle),
-			HLL_EXPORT(SetDoorSAngle, DrawDungeon_SetDoorSAngle),
-			HLL_EXPORT(SetDoorEAngle, DrawDungeon_SetDoorEAngle),
-			HLL_EXPORT(SetEvFloor, DrawDungeon_SetEvFloor),
-			HLL_EXPORT(SetEvWallN, DrawDungeon_SetEvWallN),
-			HLL_EXPORT(SetEvWallW, DrawDungeon_SetEvWallW),
-			HLL_EXPORT(SetEvWallS, DrawDungeon_SetEvWallS),
-			HLL_EXPORT(SetEvWallE, DrawDungeon_SetEvWallE),
-			HLL_EXPORT(SetEvFloor2, DrawDungeon_SetEvFloor2),
-			HLL_EXPORT(SetEvWallN2, DrawDungeon_SetEvWallN2),
-			HLL_EXPORT(SetEvWallW2, DrawDungeon_SetEvWallW2),
-			HLL_EXPORT(SetEvWallS2, DrawDungeon_SetEvWallS2),
-			HLL_EXPORT(SetEvWallE2, DrawDungeon_SetEvWallE2),
-			HLL_TODO_EXPORT(SetEvMag, DrawDungeon_SetEvMag),
-			HLL_EXPORT(SetEvRate, DrawDungeon_SetEvRate),
-			HLL_EXPORT(SetEnter, DrawDungeon_SetEnter),
-			HLL_EXPORT(SetEnterN, DrawDungeon_SetEnterN),
-			HLL_EXPORT(SetEnterW, DrawDungeon_SetEnterW),
-			HLL_EXPORT(SetEnterS, DrawDungeon_SetEnterS),
-			HLL_EXPORT(SetEnterE, DrawDungeon_SetEnterE),
-			HLL_EXPORT(SetTexFloor, DrawDungeon_SetTexFloor),
-			HLL_EXPORT(SetTexCeiling, DrawDungeon_SetTexCeiling),
-			HLL_EXPORT(SetTexWallN, DrawDungeon_SetTexWallN),
-			HLL_EXPORT(SetTexWallW, DrawDungeon_SetTexWallW),
-			HLL_EXPORT(SetTexWallS, DrawDungeon_SetTexWallS),
-			HLL_EXPORT(SetTexWallE, DrawDungeon_SetTexWallE),
-			HLL_EXPORT(SetTexDoorN, DrawDungeon_SetTexDoorN),
-			HLL_EXPORT(SetTexDoorW, DrawDungeon_SetTexDoorW),
-			HLL_EXPORT(SetTexDoorS, DrawDungeon_SetTexDoorS),
-			HLL_EXPORT(SetTexDoorE, DrawDungeon_SetTexDoorE),
-			HLL_TODO_EXPORT(SetSkyTextureSet, DrawDungeon_SetSkyTextureSet),
-			HLL_EXPORT(DrawMap, dungeon_map_draw),
-			HLL_EXPORT(SetMapAllViewFlag, dungeon_map_set_all_view),
-			HLL_EXPORT(SetDrawMapFloor, dungeon_map_set_small_map_floor),
-			HLL_EXPORT(DrawLMap, dungeon_map_draw_lmap),
-			HLL_EXPORT(SetMapCG, dungeon_map_set_cg),
-			HLL_EXPORT(SetDrawLMapFloor, dungeon_map_set_large_map_floor),
-			HLL_EXPORT(SetDrawMapRadar, dungeon_map_set_radar),
-			HLL_EXPORT(SetDrawHalfFlag, DrawDungeon_SetDrawHalfFlag),
-			HLL_EXPORT(GetDrawHalfFlag, DrawDungeon_GetDrawHalfFlag),
-			HLL_EXPORT(SetWalked, dungeon_set_walked),
-			HLL_TODO_EXPORT(SetWalkedAll, DrawDungeon_SetWalkedAll),
-			HLL_TODO_EXPORT(CalcNumofFloor, DrawDungeon_CalcNumofFloor),
-			HLL_TODO_EXPORT(CalcNumofWalk, DrawDungeon_CalcNumofWalk),
-			HLL_TODO_EXPORT(CalcNumofWalk2, DrawDungeon_CalcNumofWalk2),
-			HLL_EXPORT(CalcConquer, dungeon_calc_conquer),
-			HLL_EXPORT(SetInterlaceMode, DrawDungeon_SetInterlaceMode),
-			HLL_EXPORT(SetDirect3DMode, DrawDungeon_SetDirect3DMode),
-			HLL_EXPORT(SaveDrawSettingFlag, DrawDungeon_SaveDrawSettingFlag),
-			HLL_EXPORT(GetDrawSettingFlag, DrawDungeon_GetDrawSettingFlag),
-			HLL_EXPORT(IsDrawSettingFile, DrawDungeon_IsDrawSettingFile),
-			HLL_EXPORT(DeleteDrawSettingFile, DrawDungeon_DeleteDrawSettingFile),
-			HLL_EXPORT(IsSSEFlag, DrawDungeon_IsSSEFlag),
-			HLL_EXPORT(SetSSEFlag, DrawDungeon_SetSSEFlag),
-			HLL_EXPORT(IsPVSData, DrawDungeon_IsPVSData),
-			HLL_EXPORT(GetTexSound, DrawDungeon_GetTexSound),
-			HLL_EXPORT(StopTimer, DrawDungeon_StopTimer),
-			HLL_EXPORT(RestartTimer, DrawDungeon_RestartTimer),
-			HLL_EXPORT(LoadWalkData, dungeon_load_walk_data),
-			HLL_EXPORT(SaveWalkData, dungeon_save_walk_data)
-			);
+	    HLL_EXPORT(Init, DrawDungeon_Init),
+	    DRAW_DUNGEON_EXPORTS
+	    );
+
+HLL_WARN_UNIMPLEMENTED( , void, DrawDungeon14, SetRasterAmp, int nSurface, float fAmp);
+HLL_WARN_UNIMPLEMENTED( , void, DrawDungeon14, SetLapFilter, int surface, int type, int r, int g, int b);
+HLL_WARN_UNIMPLEMENTED(1, bool, DrawDungeon14, GetDrawMapObjectFlag, int nSurface);
+HLL_WARN_UNIMPLEMENTED( , void, DrawDungeon14, SetDrawMapObjectFlag, int nSurface, bool bFlag);
+
+HLL_LIBRARY(DrawDungeon14,
+	    HLL_EXPORT(Init, DrawDungeon14_Init),
+	    DRAW_DUNGEON_EXPORTS,
+	    HLL_EXPORT(GetWalked, dungeon_get_walked),
+	    HLL_TODO_EXPORT(SetRasterScroll, DrawDungeon14_SetRasterScroll),
+	    HLL_EXPORT(SetRasterAmp, DrawDungeon14_SetRasterAmp),
+	    HLL_EXPORT(SetLapFilter, DrawDungeon14_SetLapFilter),
+	    HLL_EXPORT(GetDrawMapObjectFlag, DrawDungeon14_GetDrawMapObjectFlag),
+	    HLL_EXPORT(SetDrawMapObjectFlag, DrawDungeon14_SetDrawMapObjectFlag)
+	    );