[Refactor] #39963 Changed header inclusion from realm*.h to realm/realm*.h

[hengband/hengband.git] / src / dungeon-file.c

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 018e2c2..8fd5c83 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -35,6 +35,7 @@
 #include "util.h"
 #include "core.h"
 
+#include "io/tokenizer.h"
 #include "files.h"
 #include "dungeon-file.h"
 #include "rooms-vault.h"
@@ -47,21 +48,21 @@
 #include "player-race.h"
 #include "dungeon.h"
 #include "floor.h"
-#include "bldg.h"
+#include "market/building.h"
 #include "world.h"
 #include "rooms-vault.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
 #include "object-ego.h"
 #include "monsterrace.h"
 #include "floor-town.h"
-#include "realm.h"
+#include "realm/realm.h"
 
 #include "trap.h"
 #include "artifact.h"
 #include "cmd-activate.h"
-#include "term.h"
+#include "gameterm.h"
 #include "wild.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 
 #include "init.h"
@@ -2807,11 +2808,11 @@ static errr parse_line_feature(floor_type *floor_ptr, char *buf)
        letter[index].special = 0;
        letter[index].random = RANDOM_NONE;
 
-       /* Fall through */
        switch (num)
        {
        case 9:
                letter[index].special = (s16b)atoi(zz[8]);
+               /* Fall through */
        case 8:
                if ((zz[7][0] == '*') && !zz[7][1])
                {
@@ -2822,6 +2823,7 @@ static errr parse_line_feature(floor_type *floor_ptr, char *buf)
                        letter[index].trap = f_tag_to_index(zz[7]);
                        if (letter[index].trap < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
                }
+               /* Fall through */
        case 7:
                if (zz[6][0] == '*')
                {
@@ -2839,6 +2841,7 @@ static errr parse_line_feature(floor_type *floor_ptr, char *buf)
                {
                        letter[index].artifact = (ARTIFACT_IDX)atoi(zz[6]);
                }
+               /* Fall through */
        case 6:
                if (zz[5][0] == '*')
                {
@@ -2849,6 +2852,7 @@ static errr parse_line_feature(floor_type *floor_ptr, char *buf)
                {
                        letter[index].ego = (EGO_IDX)atoi(zz[5]);
                }
+               /* Fall through */
        case 5:
                if (zz[4][0] == '*')
                {
@@ -2874,6 +2878,7 @@ static errr parse_line_feature(floor_type *floor_ptr, char *buf)
                {
                        letter[index].object = (IDX)atoi(zz[4]);
                }
+               /* Fall through */
        case 4:
                if (zz[3][0] == '*')
                {
@@ -2889,8 +2894,10 @@ static errr parse_line_feature(floor_type *floor_ptr, char *buf)
                {
                        letter[index].monster = (IDX)atoi(zz[3]);
                }
+               /* Fall through */
        case 3:
                letter[index].cave_info = atoi(zz[2]);
+               /* Fall through */
        case 2:
                if ((zz[1][0] == '*') && !zz[1][1])
                {