From bfd56ce4d277878f22cb2c2fb78ee92550caef47 Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 5 Jun 2020 19:33:21 +0900 Subject: [PATCH] [WIP] [Refactor] #40414 Moved concrete spell kinds file (spell-*.c/h) from spell/ to spell-kind/ --- Hengband/Hengband/Hengband.vcxproj | 48 ++++----- Hengband/Hengband/Hengband.vcxproj.filters | 131 ++++++++++++----------- src/Makefile.am | 25 ++--- src/{spell => spell-kind}/spells-beam.c | 0 src/{spell => spell-kind}/spells-beam.h | 0 src/{spell => spell-kind}/spells-detection.c | 0 src/{spell => spell-kind}/spells-detection.h | 0 src/{spell => spell-kind}/spells-floor.c | 0 src/{spell => spell-kind}/spells-floor.h | 0 src/{spell => spell-kind}/spells-genocide.c | 0 src/{spell => spell-kind}/spells-genocide.h | 0 src/{spell => spell-kind}/spells-launcher.c | 0 src/{spell => spell-kind}/spells-launcher.h | 0 src/{spell => spell-kind}/spells-lite.c | 0 src/{spell => spell-kind}/spells-lite.h | 0 src/{spell => spell-kind}/spells-neighbor.c | 0 src/{spell => spell-kind}/spells-neighbor.h | 0 src/{spell => spell-kind}/spells-pet.c | 0 src/{spell => spell-kind}/spells-pet.h | 0 src/{spell => spell-kind}/spells-sight.c | 0 src/{spell => spell-kind}/spells-sight.h | 0 src/{spell => spell-kind}/spells-specific-bolt.c | 0 src/{spell => spell-kind}/spells-specific-bolt.h | 0 src/{spell => spell-kind}/spells-teleport.c | 0 src/{spell => spell-kind}/spells-teleport.h | 0 src/{spell => spell-kind}/spells-world.c | 0 src/{spell => spell-kind}/spells-world.h | 0 27 files changed, 104 insertions(+), 100 deletions(-) rename src/{spell => spell-kind}/spells-beam.c (100%) rename src/{spell => spell-kind}/spells-beam.h (100%) rename src/{spell => spell-kind}/spells-detection.c (100%) rename src/{spell => spell-kind}/spells-detection.h (100%) rename src/{spell => spell-kind}/spells-floor.c (100%) rename src/{spell => spell-kind}/spells-floor.h (100%) rename src/{spell => spell-kind}/spells-genocide.c (100%) rename src/{spell => spell-kind}/spells-genocide.h (100%) rename src/{spell => spell-kind}/spells-launcher.c (100%) rename src/{spell => spell-kind}/spells-launcher.h (100%) rename src/{spell => spell-kind}/spells-lite.c (100%) rename src/{spell => spell-kind}/spells-lite.h (100%) rename src/{spell => spell-kind}/spells-neighbor.c (100%) rename src/{spell => spell-kind}/spells-neighbor.h (100%) rename src/{spell => spell-kind}/spells-pet.c (100%) rename src/{spell => spell-kind}/spells-pet.h (100%) rename src/{spell => spell-kind}/spells-sight.c (100%) rename src/{spell => spell-kind}/spells-sight.h (100%) rename src/{spell => spell-kind}/spells-specific-bolt.c (100%) rename src/{spell => spell-kind}/spells-specific-bolt.h (100%) rename src/{spell => spell-kind}/spells-teleport.c (100%) rename src/{spell => spell-kind}/spells-teleport.h (100%) rename src/{spell => spell-kind}/spells-world.c (100%) rename src/{spell => spell-kind}/spells-world.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index edb0bec2b..d8c6d1626 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -355,19 +355,19 @@ - + - - + + - - - - - - + + + + + + - + @@ -578,18 +578,18 @@ - + - + - - - - - - + + + + + + - + @@ -641,7 +641,7 @@ - + @@ -730,11 +730,11 @@ - + - + @@ -960,12 +960,12 @@ - + - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index d0c94f86a..fdf0da6e4 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -533,9 +533,6 @@ spell - - spell - spell @@ -545,9 +542,6 @@ spell - - spell - locale @@ -656,9 +650,6 @@ core - - spell - mind @@ -1124,21 +1115,6 @@ mind - - spell - - - spell - - - spell - - - spell - - - spell - mind @@ -1151,17 +1127,41 @@ spell - - spell + + spell-kind - - spell + + spell-kind - - spell + + spell-kind - - spell + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind @@ -1747,9 +1747,6 @@ spell - - spell - spell @@ -1759,9 +1756,6 @@ spell - - spell - locale @@ -1873,9 +1867,6 @@ core - - spell - mind @@ -2443,21 +2434,6 @@ mind - - spell - - - spell - - - spell - - - spell - - - spell - mind @@ -2470,17 +2446,41 @@ spell - - spell + + spell-kind - - spell + + spell-kind - - spell + + spell-kind - - spell + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind + + + spell-kind @@ -2611,6 +2611,9 @@ {d12d97f4-76e6-4f8e-9f45-9905cf3863f9} + + {2ed79129-9b65-4718-b9c4-ce4ef793c81f} + diff --git a/src/Makefile.am b/src/Makefile.am index 32dacc5b3..debd1310e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -390,29 +390,30 @@ hengband_SOURCES = \ spell/range-calc.c spell/range-calc.h \ spell/spells2.c spell/spells2.h \ spell/spells3.c spell/spells3.h \ - spell/spells-beam.c spell/spells-beam.h \ spell/spells-describer.c spell/spells-describer.h \ - spell/spells-detection.c spell/spells-detection.h \ spell/spells-diceroll.c spell/spells-diceroll.h \ spell/spells-execution.c spell/spells-execution.h \ - spell/spells-floor.c spell/spells-floor.h \ - spell/spells-genocide.c spell/spells-genocide.h \ spell/spells-hex.c spell/spells-hex.h \ - spell/spells-launcher.c spell/spells-launcher.h \ - spell/spells-lite.c spell/spells-lite.h \ - spell/spells-neighbor.c spell/spells-neighbor.h \ spell/spells-object.c spell/spells-object.h \ - spell/spells-pet.c spell/spells-pet.h \ - spell/spells-sight.c spell/spells-sight.h \ - spell/spells-specific-bolt.c spell/spells-specific-bolt.h \ spell/spells-summon.c spell/spells-summon.h \ spell/spells-staff-only.c spell/spells-staff-only.h \ spell/spells-status.c spell/spells-status.h \ - spell/spells-teleport.c spell/spells-teleport.h \ spell/spells-util.h spell/spells-type.h \ - spell/spells-world.c spell/spells-world.h \ spell/technic-info-table.c spell/technic-info-table.h \ \ + spell-kind/spells-beam.c spell-kind/spells-beam.h \ + spell-kind/spells-detection.c spell-kind/spells-detection.h \ + spell-kind/spells-floor.c spell-kind/spells-floor.h \ + spell-kind/spells-genocide.c spell-kind/spells-genocide.h \ + spell-kind/spells-launcher.c spell-kind/spells-launcher.h \ + spell-kind/spells-lite.c spell-kind/spells-lite.h \ + spell-kind/spells-neighbor.c spell-kind/spells-neighbor.h \ + spell-kind/spells-pet.c spell-kind/spells-pet.h \ + spell-kind/spells-sight.c spell-kind/spells-sight.h \ + spell-kind/spells-specific-bolt.c spell-kind/spells-specific-bolt.h \ + spell-kind/spells-teleport.c spell-kind/spells-teleport.h \ + spell-kind/spells-world.c spell-kind/spells-world.h \ + \ store/store.c store/store.h \ store/black-market.c store/black-market.h \ store/rumor.c store/rumor.h \ diff --git a/src/spell/spells-beam.c b/src/spell-kind/spells-beam.c similarity index 100% rename from src/spell/spells-beam.c rename to src/spell-kind/spells-beam.c diff --git a/src/spell/spells-beam.h b/src/spell-kind/spells-beam.h similarity index 100% rename from src/spell/spells-beam.h rename to src/spell-kind/spells-beam.h diff --git a/src/spell/spells-detection.c b/src/spell-kind/spells-detection.c similarity index 100% rename from src/spell/spells-detection.c rename to src/spell-kind/spells-detection.c diff --git a/src/spell/spells-detection.h b/src/spell-kind/spells-detection.h similarity index 100% rename from src/spell/spells-detection.h rename to src/spell-kind/spells-detection.h diff --git a/src/spell/spells-floor.c b/src/spell-kind/spells-floor.c similarity index 100% rename from src/spell/spells-floor.c rename to src/spell-kind/spells-floor.c diff --git a/src/spell/spells-floor.h b/src/spell-kind/spells-floor.h similarity index 100% rename from src/spell/spells-floor.h rename to src/spell-kind/spells-floor.h diff --git a/src/spell/spells-genocide.c b/src/spell-kind/spells-genocide.c similarity index 100% rename from src/spell/spells-genocide.c rename to src/spell-kind/spells-genocide.c diff --git a/src/spell/spells-genocide.h b/src/spell-kind/spells-genocide.h similarity index 100% rename from src/spell/spells-genocide.h rename to src/spell-kind/spells-genocide.h diff --git a/src/spell/spells-launcher.c b/src/spell-kind/spells-launcher.c similarity index 100% rename from src/spell/spells-launcher.c rename to src/spell-kind/spells-launcher.c diff --git a/src/spell/spells-launcher.h b/src/spell-kind/spells-launcher.h similarity index 100% rename from src/spell/spells-launcher.h rename to src/spell-kind/spells-launcher.h diff --git a/src/spell/spells-lite.c b/src/spell-kind/spells-lite.c similarity index 100% rename from src/spell/spells-lite.c rename to src/spell-kind/spells-lite.c diff --git a/src/spell/spells-lite.h b/src/spell-kind/spells-lite.h similarity index 100% rename from src/spell/spells-lite.h rename to src/spell-kind/spells-lite.h diff --git a/src/spell/spells-neighbor.c b/src/spell-kind/spells-neighbor.c similarity index 100% rename from src/spell/spells-neighbor.c rename to src/spell-kind/spells-neighbor.c diff --git a/src/spell/spells-neighbor.h b/src/spell-kind/spells-neighbor.h similarity index 100% rename from src/spell/spells-neighbor.h rename to src/spell-kind/spells-neighbor.h diff --git a/src/spell/spells-pet.c b/src/spell-kind/spells-pet.c similarity index 100% rename from src/spell/spells-pet.c rename to src/spell-kind/spells-pet.c diff --git a/src/spell/spells-pet.h b/src/spell-kind/spells-pet.h similarity index 100% rename from src/spell/spells-pet.h rename to src/spell-kind/spells-pet.h diff --git a/src/spell/spells-sight.c b/src/spell-kind/spells-sight.c similarity index 100% rename from src/spell/spells-sight.c rename to src/spell-kind/spells-sight.c diff --git a/src/spell/spells-sight.h b/src/spell-kind/spells-sight.h similarity index 100% rename from src/spell/spells-sight.h rename to src/spell-kind/spells-sight.h diff --git a/src/spell/spells-specific-bolt.c b/src/spell-kind/spells-specific-bolt.c similarity index 100% rename from src/spell/spells-specific-bolt.c rename to src/spell-kind/spells-specific-bolt.c diff --git a/src/spell/spells-specific-bolt.h b/src/spell-kind/spells-specific-bolt.h similarity index 100% rename from src/spell/spells-specific-bolt.h rename to src/spell-kind/spells-specific-bolt.h diff --git a/src/spell/spells-teleport.c b/src/spell-kind/spells-teleport.c similarity index 100% rename from src/spell/spells-teleport.c rename to src/spell-kind/spells-teleport.c diff --git a/src/spell/spells-teleport.h b/src/spell-kind/spells-teleport.h similarity index 100% rename from src/spell/spells-teleport.h rename to src/spell-kind/spells-teleport.h diff --git a/src/spell/spells-world.c b/src/spell-kind/spells-world.c similarity index 100% rename from src/spell/spells-world.c rename to src/spell-kind/spells-world.c diff --git a/src/spell/spells-world.h b/src/spell-kind/spells-world.h similarity index 100% rename from src/spell/spells-world.h rename to src/spell-kind/spells-world.h -- 2.11.0