OSDN Git Service
Eric Branlund [Sun, 25 Aug 2019 22:44:33 +0000 (15:44 -0700)]
In preparation for adding a new Mac interface which will define a preprocessor macro, MACH_O_COCOA, modified the header and source files where that preprocessor macro would be relevant. The new Mac interface doesn't try to use things like creator codes (OS X still accepts them but no longer does anything with them) so there are places where the Mac interface doesn't follow what's set for MACH_O_CARBON. Did not use MACH_O_CARBON for the new interface in case there's still interest for compiling Hengband for Macs running older versions of OS X.
Eric Branlund [Sun, 25 Aug 2019 16:56:32 +0000 (09:56 -0700)]
In preparation for adding a new Mac interface, changed prototype of init_file_paths() to take three paths, all read-only, for cases where a system does not want to store everything in lib. That brings over a change that was made in poschengband. Pass the same path for all three to get the same effect as the previous version of create_init_paths(). Added create_needed_dirs() so those platforms which do store things separately can create the writeable directories if they do not already exist. Modified main-win.c and main-mac.c to match the form of create_needed_dirs(). For main.c, changed it to match the new form of init_needed_paths() and replaced the private function which handled creating directories for the PRIVATE_USER_PATH case to use create_needed_dirs() instead.
Eric Branlund [Sun, 25 Aug 2019 16:30:54 +0000 (09:30 -0700)]
Removed comment that appeared to be extraneous: it was not related to the nearby code.
Eric Branlund [Sun, 25 Aug 2019 16:13:18 +0000 (09:13 -0700)]
Added graf field since Hengband does not ANGBAND_GRAF to store the preference file name.
Eric Branlund [Sun, 25 Aug 2019 16:10:34 +0000 (09:10 -0700)]
Added comment about how Hengband handles the directory for the tile sets and where it puts the prf files.
Eric Branlund [Sun, 25 Aug 2019 16:08:55 +0000 (09:08 -0700)]
Commented out the tile sets which don't already have .prf files in Hengband.
Eric Branlund [Sun, 25 Aug 2019 16:02:00 +0000 (09:02 -0700)]
Brought over the tile set configuration file lib/tiles/list.txt from Angband and the two tile sets, lib/tiles/adam-bolt/16x16.png and lib/tiles/old/8x8.png, that Angband uses that are also used by Hengband. For placement in the Hengband directory, replace "lib/tiles" in the path names with "lib/xtra/graf". Did not bring over Angband's prf files for the two tile sets: use Hengband's versions in lib/pref.
Eric Branlund [Sun, 25 Aug 2019 07:30:24 +0000 (00:30 -0700)]
Since ANGBAND_GRAF in Hengband is not the preference file name, added an extra field in the configuration to be what ANGBAND_GRAF will be assigned for a tile set. Largely replaced the implementation in grafmode.c with something that will work with Hengband's routines. If Hengband chooses to adopt the datafile.h/datafile.c parsing from Angband, then it would make sense to go back to Angband's version of grafmode.c.
Eric Branlund [Sun, 25 Aug 2019 07:12:15 +0000 (00:12 -0700)]
For now, keep the GRAPHICS_NONE preprocessor macro in defines.h: comment out the equivalent definition in grafmode.h.
Eric Branlund [Sun, 25 Aug 2019 07:10:52 +0000 (00:10 -0700)]
Added comment to explain relationship with the rest of Hengband.
Eric Branlund [Sun, 25 Aug 2019 07:01:57 +0000 (00:01 -0700)]
Imported from Angband 4 to support an OS X main program, main-cocoa.m, which expected that style of tile set configuration. These are the upstream versions, commit
6cbfed5 for grafmode.c and commit
6583275 for grafmode.h in the angband/angband respository, https://github.com/angband/angband .
Eric Branlund [Sun, 25 Aug 2019 06:23:02 +0000 (23:23 -0700)]
After running ./configure, make distcheck fails: it uses a VPATH build where the build directory is separate from the sources. Using $(srcdir)/gcc-wrap instead of ./gcc-wrap fixes that while still allowing builds in the same directory as the source.
Eric Branlund [Sun, 25 Aug 2019 06:14:41 +0000 (23:14 -0700)]
Added gcc-wrap to the list of files to distribute in Makefile.am.
Eric Branlund [Sun, 25 Aug 2019 06:11:14 +0000 (23:11 -0700)]
After running ./configure, make distcheck would fail because src/Makefile.am listed the non-existent file, monster-process.h as a source. Fixed.
Eric Branlund [Sun, 25 Aug 2019 05:49:41 +0000 (22:49 -0700)]
After running ./configure, make dist generates a distribution without lib/sound/readme.txt and the individual sound files. Added those to the list of files to distribute. Call out se_maoudamashii_voice_monster01.wav separately since it isn't mentioned in sound.cfg.
Eric Branlund [Sun, 25 Aug 2019 05:47:51 +0000 (22:47 -0700)]
After running ./configure, make dist generates a distribution missing lib/xtra/music/music.cfg. Added it to the list of files to distribute since src/win-main.c references it.
Eric Branlund [Sun, 25 Aug 2019 05:45:22 +0000 (22:45 -0700)]
After running ./configure, make dist generates a distribution missing lib/pref/graf-ne2.prf. Fixed.
Eric Branlund [Sun, 25 Aug 2019 05:43:15 +0000 (22:43 -0700)]
After running ./configure. make dist generates a distribution without lib/help/faq.txt. Fixed.
Eric Branlund [Sun, 25 Aug 2019 05:41:07 +0000 (22:41 -0700)]
After running ./configure, make dist generated a distribution without lib/file/sname.txt. Fixed.
Eric Branlund [Sun, 25 Aug 2019 05:37:59 +0000 (22:37 -0700)]
After using ./configure, make dist generated a distribution without lib/edit/q0dumpwitness.txt. Fixed.
Eric Branlund [Sun, 25 Aug 2019 05:20:09 +0000 (22:20 -0700)]
Corrected English message for typo ("powerfull" instead of "powerful") and subjet/verb agreement. It still is a bit garbled, but I'm reluctant to reword it without knowing what the Japanese version says.
Eric Branlund [Sun, 25 Aug 2019 05:16:55 +0000 (22:16 -0700)]
Corrected typo ("enugh" instead of "enough") in English message.
Eric Branlund [Sun, 25 Aug 2019 05:13:00 +0000 (22:13 -0700)]
In English inventory display, ranged weapons have the string "/current_world_ptr->game_turn" in the damage summary. Changed that to "/turn" instead.
Eric Branlund [Sun, 25 Aug 2019 05:00:55 +0000 (22:00 -0700)]
The English prompt to select a stat to boost at level 10 uses the same letter, 'a', for each stat. Changed to used 'a' through 'f'.
Eric Branlund [Sun, 25 Aug 2019 04:35:46 +0000 (21:35 -0700)]
Corrected compiler warnings (long format specifier with int parameter) when the source is configured with --disable-japanese and built with Apple's cc (version 10.0.1).
Eric Branlund [Sun, 25 Aug 2019 04:32:37 +0000 (21:32 -0700)]
Corrected compiler warning (unrecognized escape sequence) when the source is configured with --disable-japanese and compiled with Apple's cc (version 10.0.1).
Eric Branlund [Sun, 25 Aug 2019 03:57:02 +0000 (20:57 -0700)]
Makefile.am did not include term.c and term.h in the sources leading to a missing object when linking. Fixed.
Eric Branlund [Sun, 25 Aug 2019 03:51:54 +0000 (20:51 -0700)]
After configuring with ./configure --disable-japanese, linking failed due to missing objects. Escaping a newline in src/Makefile.am fixes most of those.
Eric Branlund [Sun, 25 Aug 2019 03:46:45 +0000 (20:46 -0700)]
On OS X 10.14.6 with Apple's cc, version 10.0.1, there were some compiler errors after the source was configured with --disable-japanese. These changes eliminate those errors.
deskull [Wed, 10 Apr 2019 10:50:13 +0000 (19:50 +0900)]
[fix] #37353 "floor" 変数がリリースビルド時のmath.hと重複していたので修正。
deskull [Wed, 3 Apr 2019 14:57:16 +0000 (23:57 +0900)]
[Fix] #37285 ティボルトのUNIQUE属性付加忘れを修正。
deskull [Wed, 3 Apr 2019 14:51:42 +0000 (23:51 +0900)]
[fix] #38790 チャージマンが分裂処理とあやしい影の時はジュラル星人と誤認しないよう処理を追加。
deskull [Wed, 3 Apr 2019 00:28:42 +0000 (09:28 +0900)]
[Refactor] #39076 /* Check for quest completion */ と /* Reset sleep counter */ を削除。
deskull [Wed, 3 Apr 2019 00:07:06 +0000 (09:07 +0900)]
[Refactor] monster_name() で一部 cmd2.c の投擲対象処理を整理。
deskull [Tue, 2 Apr 2019 14:51:36 +0000 (23:51 +0900)]
[Refactor] #37353 chest_traps を trap.c へ移動。
deskull [Tue, 2 Apr 2019 14:42:36 +0000 (23:42 +0900)]
[Refactor] #37353 未使用関数宣言 create_name() を削除。
deskull [Tue, 2 Apr 2019 14:38:23 +0000 (23:38 +0900)]
[Refactor] #37353 monster_name() を monster.h へ移動。
deskull [Tue, 2 Apr 2019 01:12:25 +0000 (10:12 +0900)]
[Refactor] #37353 cmd-mane.h を作成して変数宣言移動。 mane.c を cmd-mane.c に改名。
deskull [Mon, 1 Apr 2019 23:54:52 +0000 (08:54 +0900)]
[Refactor] #37353 cmd-hissatsu.h を作成して変数宣言移動。
deskull [Mon, 1 Apr 2019 14:40:54 +0000 (23:40 +0900)]
[Refactor] #37353 cnv_stat() と modify_stat_value() を player-status.c/h へ移動。
deskull [Mon, 1 Apr 2019 14:30:25 +0000 (23:30 +0900)]
[Refactor] #37353 horror_desc, funny_desc, funny_comments を player-status.c に移動。
deskull [Mon, 1 Apr 2019 14:19:36 +0000 (23:19 +0900)]
[Refactor] #39076 object-hook.c のコメント一部削除。
deskull [Mon, 1 Apr 2019 14:14:13 +0000 (23:14 +0900)]
[Refactor] #37353 monster.h に関数定義移動。
deskull [Mon, 1 Apr 2019 14:12:52 +0000 (23:12 +0900)]
[Fix] #37353 コミットし忘れ修正。
deskull [Sat, 30 Mar 2019 10:41:19 +0000 (19:41 +0900)]
[Refactor] #39077 IDX を MONSTER_IDX や MONRACE_IDX。
deskull [Sat, 30 Mar 2019 10:21:53 +0000 (19:21 +0900)]
[Fix] #37353 berserk()のターン追加時の現値参照元が狂戦士化でなく士気高揚になっていたミスを修正。
deskull [Sat, 30 Mar 2019 10:17:52 +0000 (19:17 +0900)]
[Refactor] #39077 POSITION 1件。同ソースインデント修正。
deskull [Sat, 30 Mar 2019 09:38:00 +0000 (18:38 +0900)]
[Refactor] #39076 /* Invulnabilty */ と /* Speed */ を削除。
deskull [Sat, 30 Mar 2019 09:31:57 +0000 (18:31 +0900)]
[Refactor] #37353 monster_desc() の宣言を monster.h に移動。
deskull [Sat, 30 Mar 2019 05:34:37 +0000 (14:34 +0900)]
[Refactor] #37353 MD_WRONGDOER_NAME を定義.
deskull [Sat, 30 Mar 2019 04:58:01 +0000 (13:58 +0900)]
[Refactor] #39077 BIT_FLAGS2件。
deskull [Tue, 26 Mar 2019 14:32:16 +0000 (23:32 +0900)]
[Refactor] #39076 test_hit_norm() のコメント修正。
deskull [Fri, 22 Mar 2019 15:32:15 +0000 (00:32 +0900)]
[Refactor] #37353 monster-spell.h を追加。
deskull [Fri, 22 Mar 2019 04:26:01 +0000 (13:26 +0900)]
[Refactor] #39076 "/* Visual update */" を削除。
deskull [Fri, 22 Mar 2019 04:15:08 +0000 (13:15 +0900)]
[Refactor] #39076 "/* Paranoia */" を削除.
deskull [Thu, 21 Mar 2019 15:17:49 +0000 (00:17 +0900)]
[Fix] #38936 do_cmd_quaff_potion_aux() の take_turn() 抜け修正。 / Add lacked take_turn() in do_cmd_quaff_potion_aux()
deskull [Thu, 21 Mar 2019 14:51:11 +0000 (23:51 +0900)]
[Refactor] #37353 Add TODO comment.
deskull [Thu, 21 Mar 2019 14:46:05 +0000 (23:46 +0900)]
[refactor] #39077 SPEED in get_mspeed().
deskull [Thu, 21 Mar 2019 14:29:54 +0000 (23:29 +0900)]
[Refactor] #39076 Delete "/* Access the location */".
deskull [Thu, 21 Mar 2019 13:28:09 +0000 (22:28 +0900)]
[fix] #39075 do_cmd_pet_dismiss() が calc_alignment() 実装にあたり同関数を通さない流れになっていたので修正。 / Fix that do_cmd_pet_dismiss() calls calc_alignment().
deskull [Thu, 21 Mar 2019 13:18:33 +0000 (22:18 +0900)]
[Refactor] #39073 calc_bonuses() から calc_alignment() を分離。 / Separate calc_alignment() from calc_bonuses().
deskull [Wed, 20 Mar 2019 16:04:16 +0000 (01:04 +0900)]
[Refactor] #39073 アライメント再計算処理をcalc_bonuses()へ統一。 / Unify recalculation of alignment to calc_bonuses().
deskull [Wed, 20 Mar 2019 15:59:08 +0000 (00:59 +0900)]
[Fix] #37353 monster_is_valid()の間抜けなbool反転ミスを修正。 / Fix shameful bug in monster_is_valid().
deskull [Wed, 20 Mar 2019 15:18:24 +0000 (00:18 +0900)]
[Refactor] #37353 型の置換。 / Type replacement. (calculate_upkeep())
deskull [Wed, 20 Mar 2019 15:13:33 +0000 (00:13 +0900)]
[Refactor] #39073 Delete friend_align and check_pets_num_and_align().
deskull [Wed, 20 Mar 2019 14:16:03 +0000 (23:16 +0900)]
[Refactor] #37353 コメント整理。 / Refactor comments.
deskull [Wed, 20 Mar 2019 14:12:10 +0000 (23:12 +0900)]
[Refactor] #37353 型の置換。 / Type replacement. (MONRACE_IDX)
deskull [Wed, 20 Mar 2019 14:06:44 +0000 (23:06 +0900)]
[Refactor] #37353 Delete ang_sort_comp, ang_sort_swap, global variable.
deskull [Wed, 20 Mar 2019 03:44:41 +0000 (12:44 +0900)]
[Refactor] #37353 ang_sort_*() in wizard1.c to sort.c.
deskull [Wed, 20 Mar 2019 03:41:50 +0000 (12:41 +0900)]
[Refactor] #37353 ang_sort_*() in save.c to sort.c.
deskull [Wed, 20 Mar 2019 03:38:33 +0000 (12:38 +0900)]
[Refactor] #37353 ang_sort_comp and ang_sort_swap to sort.c.
deskull [Wed, 20 Mar 2019 03:36:10 +0000 (12:36 +0900)]
[Refactor] #37353 ang_sort_*() in cmd-pet.c and cmd4.c to sort.c.
deskull [Tue, 19 Mar 2019 14:27:55 +0000 (23:27 +0900)]
[Refactor] #37353 ang_sort_*() in cmd-item.c to sort.c.
deskull [Tue, 19 Mar 2019 14:17:06 +0000 (23:17 +0900)]
[Refactor] #37353 ang_sort_comp_pet() to sort.c.
deskull [Tue, 19 Mar 2019 13:51:47 +0000 (22:51 +0900)]
[Refactor] #37353 ang_sort_*() in cmd4.c to sort.c.
deskull [Tue, 19 Mar 2019 13:47:01 +0000 (22:47 +0900)]
[Refactor] #37353 コメント整理。 / Refactor comments.
deskull [Tue, 19 Mar 2019 13:42:26 +0000 (22:42 +0900)]
[Refactor] #37353 Delete unused #define.
deskull [Tue, 19 Mar 2019 13:40:47 +0000 (22:40 +0900)]
[Refactor] #37353 ang_sort_*() in xtra2.c to sort.c.
deskull [Tue, 19 Mar 2019 13:35:41 +0000 (22:35 +0900)]
[Refactor] #37353 look_mon_desc() to monster1.c.
deskull [Tue, 19 Mar 2019 04:06:50 +0000 (13:06 +0900)]
[Refactor] #37353 get_screen_size() to view-mainwindow.c.
deskull [Tue, 19 Mar 2019 04:01:49 +0000 (13:01 +0900)]
[Refactor] #37353 extract_note_dies() to monster1.c.
deskull [Tue, 19 Mar 2019 03:57:25 +0000 (12:57 +0900)]
[Refactor] #37353 check_experience() to player-status.c.
deskull [Mon, 18 Mar 2019 14:57:22 +0000 (23:57 +0900)]
[Refactor] #37353 型の置換。 / Type replacement. (DEPTH on mspells4.c)
deskull [Mon, 18 Mar 2019 14:53:50 +0000 (23:53 +0900)]
[Fix] #37353 monster_u_mode() 修正。 / Fix monster_u_mode().
deskull [Mon, 18 Mar 2019 14:49:30 +0000 (23:49 +0900)]
[Refactor] #37353 monster_wakeup() を削除。 / Delete monster_wakeup().
deskull [Mon, 18 Mar 2019 14:43:47 +0000 (23:43 +0900)]
[Refactor] #37353 コメント整理。 / Refactor comments.
deskull [Mon, 18 Mar 2019 14:40:21 +0000 (23:40 +0900)]
[Refactor] #37353 メッセージ整理。 / Refactor messages.
deskull [Mon, 18 Mar 2019 14:33:47 +0000 (23:33 +0900)]
[Refactor] #37353 型の置換。 / Type replacement. (MISC)
deskull [Mon, 18 Mar 2019 04:43:50 +0000 (13:43 +0900)]
[Fix] #37353 Fix Makefile.am.
deskull [Mon, 18 Mar 2019 04:37:44 +0000 (13:37 +0900)]
[Fix] #37353 コミットし忘れ修正。 / Fix forgetting commit.
deskull [Mon, 18 Mar 2019 04:15:12 +0000 (13:15 +0900)]
[Refactor] #38998 sanity_blast() to player-status.c.
deskull [Mon, 18 Mar 2019 04:09:17 +0000 (13:09 +0900)]
[Refactor] #37353 object_is_quest_target() to object-hook.c.
deskull [Sun, 17 Mar 2019 13:18:04 +0000 (22:18 +0900)]
[Refactor] #37353 floor-generate.h 追加。 / Add floor-generate.h.
deskull [Sun, 17 Mar 2019 12:19:03 +0000 (21:19 +0900)]
[Refactor] #37353 floor-save.h 追加。 / Add floor-save.h.
deskull [Sun, 17 Mar 2019 07:29:13 +0000 (16:29 +0900)]
[Refactor] #37353 close_game() to dungeon.c.
deskull [Sun, 17 Mar 2019 07:20:09 +0000 (16:20 +0900)]
[Refactor] #37353 do_cmd_suicide() to cmd2.c.
deskull [Sun, 17 Mar 2019 07:16:01 +0000 (16:16 +0900)]
[Refactor] #37353 テキストポジション定義を view-mainwindow.c に移動。 / Definitions of text position to view-mainwindow.c.
deskull [Sun, 17 Mar 2019 07:02:08 +0000 (16:02 +0900)]
[Refactor] #37353 プレイヤーマクロのいくつかを player-status.h に移動。 / Some player status macros to player-status.h.
deskull [Sun, 17 Mar 2019 06:14:50 +0000 (15:14 +0900)]
[Refactoring] #39068 Define only MFLAG_ETF.
deskull [Sun, 17 Mar 2019 06:04:29 +0000 (15:04 +0900)]
[Refactor] #38844 MFLAG_TEMP to MFLAG_LOS.