From 3ab3de21eb07467dbd0cc353ff8c4ab54726ebe8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:10:43 -0700 Subject: [PATCH 01/11] angband-version.h was moved from core to system. --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 91269052a..4f83239d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects bin_PROGRAMS = hengband hengband_SOURCES = \ - system/angband.h system/h-basic.h system/h-config.h \ + system/angband.h system/angband-version.h \ + system/h-basic.h system/h-config.h \ system/h-define.h system/h-system.h system/h-type.h \ system/system-variables.c system/system-variables.h \ system/gamevalue.h \ @@ -99,7 +100,7 @@ hengband_SOURCES = \ core/game-play.c core/game-play.h \ core/show-file.c core/show-file.h \ core/stuff-handler.c core/stuff-handler.h \ - core/angband-version.h core/special-internal-keys.h \ + core/special-internal-keys.h \ core/output-updater.c core/output-updater.h \ core/game-closer.c core/game-closer.h \ core/turn-compensator.c core/turn-compensator.h \ -- 2.21.1 (Apple Git-122.3) From e7409e1d715f62a1118bfa4dfe1d9184c8e01933 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:11:56 -0700 Subject: [PATCH 02/11] targeting.{c,h} moved to io subdirectory. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4f83239d1..3d3f513ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,6 +80,7 @@ hengband_SOURCES = \ io/dump-remover.c io/dump-remover.h \ io/files.c io/files.h \ io/gf-descriptions.c io/gf-descriptions.h \ + io/targeting.c io/targeting.h \ io/tokenizer.c io/tokenizer.h \ io/interpret-pref-file.c io/interpret-pref-file.h \ io/player-status-dump.c io/player-status-dump.h \ @@ -268,7 +269,7 @@ hengband_SOURCES = \ mspell/mspell-special.c mspell/mspell-special.h \ mspell/mspell-particular.c mspell/mspell-particularity.h \ \ - view-mainwindow.c view-mainwindow.h targeting.c targeting.h \ + view-mainwindow.c view-mainwindow.h \ \ knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \ knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \ -- 2.21.1 (Apple Git-122.3) From 9f7cf11c0666533ad8e7f52d446b6b1b71cf09ea Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:13:09 -0700 Subject: [PATCH 03/11] quest.{c,h} moved to dungeon subdirectory. --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3d3f513ee..bd993c91e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -114,6 +114,7 @@ hengband_SOURCES = \ dungeon/dungeon.c dungeon/dungeon.h \ dungeon/dungeon-processor.c dungeon/dungeon-processor.h \ dungeon/dungeon-file.c dungeon/dungeon-file.h \ + dungeon/quest.h dungeon/quest.c \ \ floor/floor.c floor/floor.h floor/floor-events.c floor/floor-events.h \ floor/floor-generate.c floor/floor-generate.h \ @@ -188,8 +189,6 @@ hengband_SOURCES = \ player/player-personality.c player/player-personality.h \ player/player-sex.c player/player-sex.h player/selfinfo.c player/selfinfo.h \ \ - quest.h quest.c\ - \ realm/realm.c realm/realm.h \ realm/realm-arcane.c realm/realm-arcane.h \ realm/realm-chaos.c realm/realm-chaos.h \ -- 2.21.1 (Apple Git-122.3) From 430f6a6229d0cd81df3abfc0d07948fd485b8162 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:13:44 -0700 Subject: [PATCH 04/11] patron.{c,h} moved to player subdirectory. --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bd993c91e..d6c8506e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,8 +177,6 @@ hengband_SOURCES = \ inventory/pack-overflow.c inventory/pack-overflow.h \ inventory/player-inventory.c inventory/player-inventory.h \ \ - patron.h patron.c \ - \ player/player-move.c player/player-move.h \ player/player-damage.c player/player-damage.h \ player/player-status.c player/player-status.h \ @@ -186,6 +184,7 @@ hengband_SOURCES = \ player/player-skill.c player/player-skill.h \ player/player-class.c player/player-class.h \ player/player-race.c player/player-race.h \ + player/patron.h player/patron.c \ player/player-personality.c player/player-personality.h \ player/player-sex.c player/player-sex.h player/selfinfo.c player/selfinfo.h \ \ -- 2.21.1 (Apple Git-122.3) From fff79db060675cf3725b32d0d11f3212a9bd3c95 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:14:42 -0700 Subject: [PATCH 05/11] Corrected two errors in source file list (one missing subdirectory; the other misspelled). --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d6c8506e9..5c2223bb8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -242,7 +242,7 @@ hengband_SOURCES = \ spell/spells1.c spell/spells1.h spell/spells2.c spell/spells2.h \ spell/spells3.c spell/spells3.h \ spell/music-checker.c spell/music-checker.h \ - spells-diceroll.c spell/spells-diceroll.h \ + spell/spells-diceroll.c spell/spells-diceroll.h \ spell/spells-floor.c spell/spells-floor.h \ spell/spells-object.c spell/spells-object.h \ spell/spells-status.c spell/spells-status.h \ @@ -265,7 +265,7 @@ hengband_SOURCES = \ mspell/mspell-floor.c mspell/mspell-floor.h \ mspell/mspell-status.c mspell/mspell-status.h \ mspell/mspell-special.c mspell/mspell-special.h \ - mspell/mspell-particular.c mspell/mspell-particularity.h \ + mspell/mspell-particularity.c mspell/mspell-particularity.h \ \ view-mainwindow.c view-mainwindow.h \ \ -- 2.21.1 (Apple Git-122.3) From d478e90cc76eda6b8af183f42967e35ec158b4e9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:41:49 -0700 Subject: [PATCH 06/11] Corrected typo in source list ("bitrh" instead of "birth"). --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5c2223bb8..c63592f45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,7 @@ hengband_SOURCES = \ autopick/autopick-editor-util.c autopick/autopick-editor-util.h \ autopick/autopick-editor-command.c autopick/autopick-editor-command.h \ \ - birth/bitrh-explanations-table.c birth/bitrh-explanations-table.h \ + birth/birth-explanations-table.c birth/birth-explanations-table.h \ birth/birth.c birth/birth.h \ birth/history.c birth/history.h \ birth/birth-util.c birth/birth-util.h \ -- 2.21.1 (Apple Git-122.3) From 1b4ba9443d905bf652a2557b7389c73a4fff9784 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:44:39 -0700 Subject: [PATCH 07/11] Corrected typos in source list ("hp-mp-generator" instead of "hp-mp-regenerator"). --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index c63592f45..54500253c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,7 +105,7 @@ hengband_SOURCES = \ core/output-updater.c core/output-updater.h \ core/game-closer.c core/game-closer.h \ core/turn-compensator.c core/turn-compensator.h \ - core/hp-mp-generator.c core/hp-mp-generator.h \ + core/hp-mp-regenerator.c core/hp-mp-regenerator.h \ core/hp-mp-processor.c core/hp-mp-processor.h \ core/magic-effects-timeout-reducer.c core/magic-effects-timeout-reducer.h \ core/player-processor.c core/player-processor.h \ -- 2.21.1 (Apple Git-122.3) From 95e8b45dc8d0f733f1584a832a323c625d9e2bdc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:45:19 -0700 Subject: [PATCH 08/11] Adapted to change that moved system-variables.h from core to system. --- src/main-x11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main-x11.c b/src/main-x11.c index 9b40b0558..c844ffa0f 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -94,7 +94,7 @@ #include "system/angband.h" #include "main/sound-definitions-table.h" -#include "core/system-variables.h" +#include "system/system-variables.h" #include "io/files.h" #include "term/gameterm.h" -- 2.21.1 (Apple Git-122.3) From 4d81fd650e4bb68360999da90f5be9a9fcb9dcff Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:49:51 -0700 Subject: [PATCH 09/11] Removed view-mainwindow.{c,h} from source list (left over from change that moved them to view/display-main-window.{c,h}). --- src/Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 54500253c..0fd86b5a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -267,8 +267,6 @@ hengband_SOURCES = \ mspell/mspell-special.c mspell/mspell-special.h \ mspell/mspell-particularity.c mspell/mspell-particularity.h \ \ - view-mainwindow.c view-mainwindow.h \ - \ knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \ knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \ knowledge/knowledge-features.c knowledge/knowledge-features.h \ -- 2.21.1 (Apple Git-122.3) From 5e1318047e0b1c599e2a89559d4f060dee84265d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:51:36 -0700 Subject: [PATCH 10/11] Corrected typo in source list that left off process-effects.c. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0fd86b5a0..d015aea05 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -238,7 +238,7 @@ hengband_SOURCES = \ spell/technic-info-table.c spell/technic-info-table.h \ spell/spells-execution.c spell/spells-execution.h \ spell/spells-util.h spell/spells-type.h \ - spell/process-effect.h spell/process-effect.h \ + spell/process-effect.c spell/process-effect.h \ spell/spells1.c spell/spells1.h spell/spells2.c spell/spells2.h \ spell/spells3.c spell/spells3.h \ spell/music-checker.c spell/music-checker.h \ -- 2.21.1 (Apple Git-122.3) From 28ccb73a8494232860c3335feb5dbf70ee13b5fa Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 17 May 2020 07:54:11 -0700 Subject: [PATCH 11/11] Moved x11-gamma-builder.{c,h} from EXTRA_hengband_SOURCES to hengband_SOURCES so builds using X11 will link. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d015aea05..026396b10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,6 +41,7 @@ hengband_SOURCES = \ \ main/music-definitions-table.c main/music-definitions-table.h \ main/sound-definitions-table.c main/sound-definitions-table.h \ + main/x11-gamma-builder.c main/x11-gamma-builder.h \ main/init.c main/init.h \ \ market/arena-info-table.c market/arena-info-table.h \ @@ -319,7 +320,6 @@ hengband_SOURCES = \ EXTRA_hengband_SOURCES = \ angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \ - main/x11-gamma-builder.c main/x11-gamma-builder.h \ makefile.bcc makefile.std term/readdib.c term/readdib.h wall.bmp EXTRA_DIST = \ -- 2.21.1 (Apple Git-122.3)