Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband

[hengband/hengband.git] / src / room / rooms-vault.h

diff --git a/src/room/rooms-vault.h b/src/room/rooms-vault.h
index 2d91ac2..b0888d5 100644 (file)
--- a/src/room/rooms-vault.h
+++ b/src/room/rooms-vault.h
@@ -1,13 +1,8 @@
 #pragma once 
 
-/*
- * Information about "vault generation"
- */
+#include "system/angband.h"
 
-typedef struct vault_type vault_type;
-
-struct vault_type
-{
+typedef struct vault_type {
        STR_OFFSET name;        /* Name (offset) */
        STR_OFFSET text;        /* Text (offset) */
 
@@ -15,15 +10,15 @@ struct vault_type
        PROB rat;                       /* Vault rating (unused) */
        POSITION hgt;           /* Vault height */
        POSITION wid;           /* Vault width */
-};
+} vault_type;
 
 extern vault_type *v_info;
 extern char *v_name;
 extern char *v_text;
-
 extern VAULT_IDX max_v_idx;
 
-extern bool build_type7(player_type *player_ptr);
-extern bool build_type8(player_type *player_ptr);
-extern bool build_type10(player_type *player_ptr);
-extern bool build_type17(player_type *player_ptr);
+typedef struct dun_data_type dun_data_type;
+bool build_type7(player_type *player_ptr, dun_data_type *dd_ptr);
+bool build_type8(player_type *player_ptr, dun_data_type *dd_ptr);
+bool build_type10(player_type *player_ptr, dun_data_type *dd_ptr);
+bool build_type17(player_type *player_ptr, dun_data_type *dd_ptr);