OSDN Git Service
Hourier [Wed, 22 Apr 2020 14:24:12 +0000 (23:24 +0900)]
[Refactor] #40236 Separated write_html_footer() from do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 14:20:56 +0000 (23:20 +0900)]
[Refactor] #40236 Separated write_html_header() from do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 14:16:09 +0000 (23:16 +0900)]
[Refactor] #40236 Separated check_screen_html_can_open() from do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 14:09:34 +0000 (23:09 +0900)]
[Refactor] #40236 Separated check_screen_text_can_open() from do_cmd_save_screen_text()
Hourier [Wed, 22 Apr 2020 14:05:50 +0000 (23:05 +0900)]
[Refactor] #40236 Separated screen_dump_lines() from do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 14:03:14 +0000 (23:03 +0900)]
[Refactor] #40236 Separated screen_dump_one_line() from do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 13:33:03 +0000 (22:33 +0900)]
[Refactor] #40236 Unified 2 tag-reading functions in do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 12:46:42 +0000 (21:46 +0900)]
[Refactor] #40236 Separated read_temporary_file() from do_cmd_save_screen_html_aux()
Hourier [Wed, 22 Apr 2020 11:59:34 +0000 (20:59 +0900)]
[Refactor] #40236 Separated draw_colored_characters() from do_cmd_load_screen()
Hourier [Wed, 22 Apr 2020 11:47:29 +0000 (20:47 +0900)]
[Refactor] #40236 Separated draw_white_characters() from do_cmd_load_screen()
Hourier [Wed, 22 Apr 2020 11:38:50 +0000 (20:38 +0900)]
[Refactor] #40236 Separated do_cmd_save_screen_text() from do_cmd_save_screen()
Hourier [Wed, 22 Apr 2020 11:09:57 +0000 (20:09 +0900)]
[Refactor] #40236 Separated update_use_graphics() from do_cmd_save_screen()
Hourier [Wed, 22 Apr 2020 10:04:14 +0000 (19:04 +0900)]
[Refactor] #40236 Separated ask_html_dump from do_cmd_save_screen()
Hourier [Wed, 22 Apr 2020 09:56:25 +0000 (18:56 +0900)]
[Refactor] #40236 Removed dependency from cmd-process-screen to core
Hourier [Wed, 22 Apr 2020 09:46:34 +0000 (18:46 +0900)]
[Refactor] #40236 Separated cmd-process-screen.c/h from cmd-dump.c/h
Hourier [Wed, 22 Apr 2020 09:03:18 +0000 (18:03 +0900)]
[Refactor] #40274 Moved definition values of sound from util.h to sound-definitions-table.h
Hourier [Wed, 22 Apr 2020 08:23:25 +0000 (17:23 +0900)]
[Refactor] #40274 Unified angband_music_basic_name[] into main/music-definitions-table.c/h
Hourier [Wed, 22 Apr 2020 08:11:44 +0000 (17:11 +0900)]
[Refactor] #40274 Unified angband_sound_name[] into main/sound-definitions-table.c/h
Hourier [Tue, 21 Apr 2020 15:47:07 +0000 (00:47 +0900)]
[Refactor] #40274 Removed unused definitons
Hourier [Tue, 21 Apr 2020 15:29:01 +0000 (00:29 +0900)]
[Refactor] #40236 Removed unused function pointer
Hourier [Tue, 21 Apr 2020 15:05:34 +0000 (00:05 +0900)]
[Refactor] #40236 アンデッド種族で宿屋に泊まった場合のメッセージを拡張した (日本語のみ)
Hourier [Tue, 21 Apr 2020 14:48:48 +0000 (23:48 +0900)]
[Refactor] #40236 Renamed store.c/h to market/store.c/h
Hourier [Tue, 21 Apr 2020 14:43:23 +0000 (23:43 +0900)]
[Refactor] #40236 Changed filename term.h to gameterm.h
Hourier [Tue, 21 Apr 2020 14:41:45 +0000 (23:41 +0900)]
Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier
Hourier [Tue, 21 Apr 2020 14:39:01 +0000 (23:39 +0900)]
[Refactor] #40236 Renamed bldg.c/h to market/building.c/h
Hourier [Tue, 21 Apr 2020 14:21:50 +0000 (23:21 +0900)]
[Refactor] #40236 Renamed stay_inn() to write_diary_stay_inn()
Hourier [Tue, 21 Apr 2020 14:18:51 +0000 (23:18 +0900)]
[Refactor] #40236 Separated display_stay_result() from inn_comm()
Hourier [Tue, 21 Apr 2020 14:13:04 +0000 (23:13 +0900)]
[Refactor] #40236 Separated charge_magic_eating_energy() from inn_comm()
Hourier [Tue, 21 Apr 2020 14:07:00 +0000 (23:07 +0900)]
[Refactor] #40236 Separated back_to_health() from inn_comm()
Hourier [Tue, 21 Apr 2020 14:06:37 +0000 (23:06 +0900)]
[Refactor] #40236 Separated have_a_nightmare() from inn_comm()
Hourier [Tue, 21 Apr 2020 13:44:28 +0000 (22:44 +0900)]
[Refactor] #40236 Separated pass_game_turn_by_stay() from inn_comm()
Hourier [Tue, 21 Apr 2020 13:39:05 +0000 (22:39 +0900)]
[Refactor] #40236 Separated stay_inn() from inn_comm()
Hourier [Tue, 21 Apr 2020 13:27:38 +0000 (22:27 +0900)]
[Refactor] #40236 Separated is_healthy_stay() from inn_comm()
Hourier [Tue, 21 Apr 2020 13:23:12 +0000 (22:23 +0900)]
[Refactor] #40236 Separated buy_food() from inn_comm()
Hourier [Tue, 21 Apr 2020 13:17:36 +0000 (22:17 +0900)]
[Refactor] #40275 Separated cmd-inn.c/h from bldg.c
Hourier [Tue, 21 Apr 2020 12:49:32 +0000 (21:49 +0900)]
[Refactor] #40236 Separated mimic-info-table.c/h from player-race.c/h
Hourier [Tue, 21 Apr 2020 11:37:12 +0000 (20:37 +0900)]
[Refactor] #40275 Separated race_info[] from player-race.c/h to race-info-table.c/h
Hourier [Tue, 21 Apr 2020 11:26:26 +0000 (20:26 +0900)]
[Implement] #40275 宿屋に泊まった時のメッセージをアンデッドキャラか否かで分けた (日本語のみ)
Hourier [Tue, 21 Apr 2020 10:30:01 +0000 (19:30 +0900)]
[Refactor] #49275 Renamed arena_info_table to arena-info-table
Hourier [Tue, 21 Apr 2020 10:26:54 +0000 (19:26 +0900)]
[Refactor] Separated play-gamble.c/h from bldg.c
Hourier [Tue, 21 Apr 2020 10:17:23 +0000 (19:17 +0900)]
[Refactor] #40275 Separated arena_info_table.c/h from bldg.c/h
Hourier [Tue, 21 Apr 2020 10:09:41 +0000 (19:09 +0900)]
[Refactor] #40275 Separated display-fruit.c/h from bldg.c
Hourier [Tue, 21 Apr 2020 10:04:39 +0000 (19:04 +0900)]
[Refactor] #40275 Separated building-util.c/h from bldg.c/h
Hourier [Tue, 21 Apr 2020 09:55:35 +0000 (18:55 +0900)]
[Refactor] #40236 Added pragma into cmd-inventory.h
Hourier [Tue, 21 Apr 2020 09:08:35 +0000 (18:08 +0900)]
[Refactor] #40236 Separated reset_label_number() from do_cmd_knowledge_inventory()
Hourier [Tue, 21 Apr 2020 09:04:14 +0000 (18:04 +0900)]
[Refactor] #40236 Separated show_*_equipment_resistances from do_cmd_knowledge_inventory()
Hourier [Tue, 21 Apr 2020 08:53:46 +0000 (17:53 +0900)]
[Refactor] #40236 Separated display_identified_resistances_flag() from do_cmd_knowledge_inventory_aux()
Hourier [Tue, 21 Apr 2020 08:52:19 +0000 (17:52 +0900)]
[Fix] Changed comments param to todo in show-file.c
Hourier [Tue, 21 Apr 2020 08:36:28 +0000 (17:36 +0900)]
[Refactor] #40236 Separated add_res_label() from do_cmd_knowledge_inventory_aux()
Hourier [Tue, 21 Apr 2020 08:14:16 +0000 (17:14 +0900)]
[Refactor] #40236 Separated check_item_knowledge() from do_cmd_knowledge_inventory_aux()
Hourier [Tue, 21 Apr 2020 08:03:18 +0000 (17:03 +0900)]
[Refactor] #40236 Separated determine_spcial_item_type() from do_cmd_knowledge_inventory_aux()
deskull [Mon, 20 Apr 2020 15:28:31 +0000 (00:28 +0900)]
[Fix] マージ後のVisualStudio上の警告を修正. / Fixed post-merge warning on Visual Studio.
deskull [Mon, 20 Apr 2020 15:22:27 +0000 (00:22 +0900)]
Merge branch 'refactor-fix/For2.2.2-habu' into For2.2.2-Refactoring
Habu [Mon, 20 Apr 2020 14:51:20 +0000 (23:51 +0900)]
[fix] gccの警告に従い修正
以下の細々とした警告に対応:
- switch-case文でbreakが無い(その前の関数の中でプログラムが終了するが、一応付加しておく)
- 他ファイルに移した未使用のstatic関数
- 変数の型の誤り
- 符号付き変数と符号無し変数の比較
- strlenにNULLが渡される可能性
- 未使用変数の存在
- 構造体の初期化メンバの不足
- for と同じ行に2つ以上の文がある
Hourier [Mon, 20 Apr 2020 14:34:23 +0000 (23:34 +0900)]
[Refactor] #40236 Unified languages by _() macro function
Hourier [Mon, 20 Apr 2020 14:18:37 +0000 (23:18 +0900)]
[Refactor] #40236 Changed macro functions to normal functions in cmd-inventory.c
Hourier [Mon, 20 Apr 2020 13:38:02 +0000 (22:38 +0900)]
[Refactor] #40236 Separated do_cmd_knowledge_inventory() from cmd-dump.c to cmd-inventory.c/h
Hourier [Mon, 20 Apr 2020 11:37:41 +0000 (20:37 +0900)]
[Refactor] #40236 Removed moved functions (they're not called now)
Habu [Sun, 19 Apr 2020 14:56:52 +0000 (23:56 +0900)]
[fix] 窒息攻撃の発動のバグを修正
ランダムアーティファクトの窒息攻撃を発動して効果が無かった時、意図しないswitch-case文のfall throughにより衰弱の矢の効果が発動するバグを修正。
Habu [Sun, 19 Apr 2020 14:54:41 +0000 (23:54 +0900)]
[fix] カオス的効果で余分な効果が発動するバグを修正
岩石融解(もしくは半径1の地震)が発動した時、意図しないswitch-case文のfall throughにより周囲のモンスターを眠らせる効果も発動するバグを修正した。
Habu [Sun, 19 Apr 2020 14:41:49 +0000 (23:41 +0900)]
[refactor] 意図したswitch-case文のfall throughをコメント
switch-case文で意図してfall throughしている部分に、/* Fall through */ というコメントを入れる。
これにより、以下の効果を得る:
- 意図したfall throughである事を明示する
- gccによる暗黙のfall through警告を抑制する
Hourier [Sun, 19 Apr 2020 14:37:01 +0000 (23:37 +0900)]
Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier
Habu [Sun, 19 Apr 2020 14:10:17 +0000 (23:10 +0900)]
[refactor] term.[ch]をgameterm.[ch]に改名
term.hという名称は、NCURSESのヘッダファイルである/usr/include/term.hと同名である。
システムのヘッダファイルと同名なのは好ましくないので、名称をgametermに変更する。
deskull [Sun, 19 Apr 2020 09:18:22 +0000 (18:18 +0900)]
[Fix] #40233 FILE ポインタの参照処理ミスを修正. / FILE pointer reference processing corrections.
deskull [Tue, 14 Apr 2020 15:58:28 +0000 (00:58 +0900)]
[Fix] #40326 チケット place_bold()中、gb_solid処理時に生成する壁を永久壁でなく内壁に修正. / In place_bold(), fix the wall generated during gb_solid processing to an inner wall instead of a permanent wall.
deskull [Sun, 12 Apr 2020 15:26:59 +0000 (00:26 +0900)]
[Fix] #40302 RIVER系フラグを持たないダンジョンに川が生成される問題を修正し、add_river()回りを整理。 / Fixed an issue where rivers were created in dungeons without RIVER flags and organized around add_river().
deskull [Fri, 10 Apr 2020 17:26:03 +0000 (02:26 +0900)]
[Fix] #40233 最終的に一応ビルドが通るまで整理. / Organize until the build finally passes.
deskull [Fri, 10 Apr 2020 17:10:08 +0000 (02:10 +0900)]
[Fix] #40233 インクルード忘れを修正. / Fixed missing include.
deskull [Fri, 10 Apr 2020 17:06:40 +0000 (02:06 +0900)]
[Fix] #40233 重複した open_auto_dump() と close_auto_dump() を削除. / Delete duplicated open_auto_dump() and close_auto_dump().
deskull [Fri, 10 Apr 2020 17:01:04 +0000 (02:01 +0900)]
[Fix] #40233 auto_dump_header と auto_dump_footer をconstにしてヘッダファイルに移動。 / Move auto_dump_header and auto_dump_footer to header file with add const attribute.
deskull [Fri, 10 Apr 2020 16:56:14 +0000 (01:56 +0900)]
[Fix] #40233 auto_dump_stream ファイルディスクリプタ周りをビルドが通るように展開. / Expand so that the build passes around the file descriptor, auto_dump_stream.
deskull [Fri, 10 Apr 2020 16:15:03 +0000 (01:15 +0900)]
[fix] #40282 コンフリクト解決残しを修正. / Resolve conflicts left behind.
deskull [Fri, 10 Apr 2020 16:09:20 +0000 (01:09 +0900)]
[fix] #40233 リファクタリングで起きている大量のビルドエラーを修正中。差し当たり、インクルード抜けを1件修正. / Add a lost #include.
deskull [Fri, 10 Apr 2020 14:59:35 +0000 (23:59 +0900)]
Merge branch 'For2.2.2-Refactoring' of git.osdn.net:/gitroot/hengband/hengband into For2.2.2-Refactoring
deskull [Fri, 10 Apr 2020 14:59:14 +0000 (23:59 +0900)]
[Fix] #40304 魔法棒を振った時の更新フラグ指定ミスを修正. / Correction to change for zapping unidentified wand.
deskull [Tue, 7 Apr 2020 18:09:35 +0000 (03:09 +0900)]
Merge branch 'For2.2.2-Refactoring-birth-screen-realm-clearing' of https://scm.osdn.net/gitroot/hengbandforosx/hengbandosx into For2.2.2-Refactoring
deskull [Tue, 7 Apr 2020 18:05:31 +0000 (03:05 +0900)]
Merge branch 'For2.2.2-Refactoring-English-Diary' of https://scm.osdn.net/gitroot/hengbandforosx/hengbandosx into For2.2.2-Refactoring
Eric Branlund [Sun, 29 Mar 2020 18:43:17 +0000 (11:43 -0700)]
Changed the English diary entries about the gender and personality selections so "gender" appears in the one about gender, rather than the "personality" that was there before, and "personality" appears in the one about personality.
Eric Branlund [Sun, 29 Mar 2020 18:40:34 +0000 (11:40 -0700)]
Corrected English diary entry about realm selection to put "and" between the realms if there are two and use "realm" or "realms" as appropriate.
Eric Branlund [Sun, 29 Mar 2020 17:20:51 +0000 (10:20 -0700)]
In the English version, the period at the end of the Trump realm short description wasn't being cleared on the birth realm selection screen (an earlier change made it longer and it then exceeded the length of the string used for clearing). To fix that, use prt() to clear to the end of the line when displaying the selected realm and realm short description. Also share more code between the Japanese and English versions for that display.
deskull [Thu, 26 Mar 2020 17:26:58 +0000 (02:26 +0900)]
[Fix] #37353 リファクタリング時にエンバグした get_rnd_line() の分岐処理を修正. / Fix a conditional branch bug that was added refactoring of get_rnd_line().
Hourier [Thu, 26 Mar 2020 12:15:52 +0000 (21:15 +0900)]
[Refactor] #40236 Reshaped store.c a little
deskull [Thu, 26 Mar 2020 05:41:22 +0000 (14:41 +0900)]
Merge branch 'fix/xoshiro128starstar-v1.0-bug' into For2.2.2-Refactoring
deskull [Thu, 26 Mar 2020 04:01:10 +0000 (13:01 +0900)]
Merge branch 'For2.2.2-Fix-Hourier' into For2.2.2-Refactoring
Eric Branlund [Wed, 25 Mar 2020 13:47:59 +0000 (06:47 -0700)]
Corrected English typo ('Arane' rather than 'Arena' in diary messages).
Habu [Wed, 25 Mar 2020 12:50:58 +0000 (21:50 +0900)]
[fix] #40237 乱数生成アルゴリズムxoshiro128**をバージョン1.1にする
deskull [Tue, 24 Mar 2020 16:01:14 +0000 (01:01 +0900)]
[Fix] #38790 ジュラル星人誤認判定変更ミスをさらに修正. / Fix Chargeman's process timing condition of Misconception to Alien Jural again.
Eric Branlund [Tue, 24 Mar 2020 15:44:09 +0000 (08:44 -0700)]
For consistency, changed English diary entries to use simple past tense. In a couple that included "you" as the subject, dropped that for conistency with the others that omit it. Made a couple of changes in the diary text to be more idiomatic.
Hourier [Sun, 22 Mar 2020 12:58:35 +0000 (21:58 +0900)]
[Refactor] #40233 Somefunctions moved from store.c/h to store-util.c/h and separated black-market.c/h from store.c
Hourier [Sun, 22 Mar 2020 12:14:22 +0000 (21:14 +0900)]
[Refactor] #40233 Unified Japanese/English resources
Hourier [Sun, 22 Mar 2020 12:03:19 +0000 (21:03 +0900)]
[Refactor] #40233 Separated gold-magnification-table.c/h from store.c
Hourier [Sun, 22 Mar 2020 11:53:37 +0000 (20:53 +0900)]
[Refactor] WIP #40233 Separated store-comments.c/h and store-util.h from store.c/h
Hourier [Sun, 22 Mar 2020 11:34:55 +0000 (20:34 +0900)]
[Refactor] #40233 Moved comment_7* from store.c to store-owner-comments.c/h
Hourier [Sun, 22 Mar 2020 11:27:23 +0000 (20:27 +0900)]
[Refactor] #40233 Separated articles-on-sale.c/h from store.c/h
Hourier [Sun, 22 Mar 2020 11:16:26 +0000 (20:16 +0900)]
[Refactor] #40233 Separated store-owner-comments.c/h from sotre.c
Hourier [Sun, 22 Mar 2020 10:54:06 +0000 (19:54 +0900)]
[Refactor] #40233 Separated store-owners.c/h from store.c/h
Hourier [Sun, 22 Mar 2020 10:24:10 +0000 (19:24 +0900)]
[Refactor] #40275 Separated poker.c/h from bldg.c
Hourier [Sun, 22 Mar 2020 10:08:15 +0000 (19:08 +0900)]
[Refactor] Added 'extern' to lighting_level_str[]
Hourier [Sun, 22 Mar 2020 09:48:07 +0000 (18:48 +0900)]
[Refactor] #40236 Separated cmd-visuals.c/h from cmd-cump.c/h
Hourier [Sun, 22 Mar 2020 09:10:52 +0000 (18:10 +0900)]
[Refactor] #40236 Separated lighting-level-table.c/h from cmd-dump.c