X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=src%2Ffloor%2Fwild.c;h=ff9e64ac05dbf1abc43212ae043961280d28fa32;hb=dffe8f38ed5f630572659d18b0e975ed6db9eb24;hp=a7eea08a49d58e5b4b5207db707a32562d87772e;hpb=af449284d3a4b73b12b069c87b077efa99f15939;p=hengband%2Fhengband.git diff --git a/src/floor/wild.c b/src/floor/wild.c index a7eea08a4..ff9e64ac0 100644 --- a/src/floor/wild.c +++ b/src/floor/wild.c @@ -12,8 +12,10 @@ #include "floor/wild.h" #include "core/asking-player.h" +#include "dungeon/dungeon-flag-types.h" #include "dungeon/dungeon.h" #include "dungeon/quest.h" +#include "floor/cave.h" #include "floor/floor-town.h" #include "game-option/birth-options.h" #include "game-option/map-screen-options.h" @@ -23,7 +25,7 @@ #include "info-reader/parse-error-types.h" #include "io/files-util.h" #include "io/tokenizer.h" -#include "main/init.h" +#include "market/building-initializer.h" #include "monster-floor/monster-generator.h" #include "monster-floor/monster-remover.h" #include "monster-floor/monster-summon.h" @@ -36,6 +38,7 @@ #include "realm/realm-names-table.h" #include "spell-realm/spells-hex.h" #include "status/action-setter.h" +#include "system/floor-type-definition.h" #include "system/system-variables.h" #include "util/bit-flags-calculator.h" #include "view/display-messages.h" @@ -51,6 +54,17 @@ wilderness_type **wilderness; bool generate_encounter; +typedef struct border_type { + s16b north[MAX_WID]; + s16b south[MAX_WID]; + s16b east[MAX_HGT]; + s16b west[MAX_HGT]; + s16b north_west; + s16b north_east; + s16b south_west; + s16b south_east; +} border_type; + /*! * @brief 地形生成確率を決める要素100の配列を確率テーブルから作成する * @param feat_type 非一様確率を再現するための要素数100の配列