• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision50cb96556693005e66c513689ebd3186868ca941 (tree)
Time2017-10-01 20:33:58
AuthorDeskull <desull@user...>
CommiterDeskull

Log Message

#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

Change Summary

Incremental Difference

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3294,7 +3294,7 @@ static int repair_broken_weapon_aux(int bcost)
32943294 else /* TV_BROKEN_SWORD */
32953295 {
32963296 /* Repair to a sword or sometimes material's type weapon */
3297- IDX tval = (one_in_(5) ? mo_ptr->tval : TV_SWORD);
3297+ OBJECT_TYPE_VALUE tval = (one_in_(5) ? mo_ptr->tval : TV_SWORD);
32983298
32993299 while(1)
33003300 {
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -3477,7 +3477,7 @@ void do_cmd_visuals(void)
34773477 case '5':
34783478 {
34793479 static cptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars");
3480- static int k = 0;
3480+ static IDX k = 0;
34813481 prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0);
34823482
34833483 /* Hack -- query until done */
@@ -5619,7 +5619,7 @@ static void do_cmd_knowledge_uniques(void)
56195619 {
56205620 int i, k, n = 0;
56215621 u16b why = 2;
5622- s16b *who;
5622+ IDX *who;
56235623
56245624 FILE *fff;
56255625
@@ -7452,7 +7452,7 @@ static void display_feature_list(int col, int row, int per_page, int *feat_idx,
74527452 /*
74537453 * Interact with feature visuals.
74547454 */
7455-static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, int direct_f_idx, int *lighting_level)
7455+static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f_idx, int *lighting_level)
74567456 {
74577457 IDX i;
74587458 int len, max;
@@ -7486,7 +7486,7 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, int d
74867486 browser_rows = hgt - 8;
74877487
74887488 /* Allocate the "feat_idx" array */
7489- C_MAKE(feat_idx, max_f_idx, int);
7489+ C_MAKE(feat_idx, max_f_idx, IDX);
74907490
74917491 max = 0;
74927492 grp_cnt = 0;
@@ -8342,7 +8342,8 @@ static void do_cmd_knowledge_quests(void)
83428342 FILE *fff;
83438343 char file_name[1024];
83448344 IDX *quest_num;
8345- int dummy, i;
8345+ int dummy;
8346+ IDX i;
83468347
83478348 /* Open a new file */
83488349 fff = my_fopen_temp(file_name, 1024);
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -1051,7 +1051,9 @@ static void wild_magic(int spell)
10511051 */
10521052 void do_cmd_cast(void)
10531053 {
1054- int item, sval, spell, realm;
1054+ int item;
1055+ OBJECT_SUBTYPE_VALUE sval;
1056+ int spell, realm;
10551057 int chance;
10561058 int increment = 0;
10571059 int use_realm;
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -2585,7 +2585,7 @@ static int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool m
25852585 if (sval == SV_WAND_WONDER)
25862586 {
25872587 int vir = virtue_number(V_CHANCE);
2588- sval = randint0(SV_WAND_WONDER);
2588+ sval = (OBJECT_SUBTYPE_VALUE)randint0(SV_WAND_WONDER);
25892589
25902590 if (vir)
25912591 {
--- a/src/files.c
+++ b/src/files.c
@@ -4424,7 +4424,7 @@ static void dump_aux_class_special(FILE *fff)
44244424 */
44254425 static void dump_aux_quest(FILE *fff)
44264426 {
4427- int i;
4427+ IDX i;
44284428 IDX *quest_num;
44294429 int dummy;
44304430
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1441,9 +1441,11 @@ static bool adjacent_grid_check(monster_type *m_ptr, POSITION *yp, POSITION *xp,
14411441 */
14421442 bool make_attack_spell(IDX m_idx)
14431443 {
1444- int k, thrown_spell = 0, rlev, failrate;
1444+ int k, thrown_spell = 0;
1445+ DEPTH rlev;
1446+ PERCENTAGE failrate;
14451447 byte spell[96], num = 0;
1446- u32b f4, f5, f6;
1448+ BIT_FLAGS f4, f5, f6;
14471449 monster_type *m_ptr = &m_list[m_idx];
14481450 monster_race *r_ptr = &r_info[m_ptr->r_idx];
14491451 char m_name[80];
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -222,7 +222,7 @@ void get_project_point(int sy, int sx, int *ty, int *tx, int flg)
222222 * @param t_idx 目標のモンスターID
223223 * @return 魔力消去を使うべきならばTRUEを変えす。
224224 */
225-static bool dispel_check_monster(int m_idx, int t_idx)
225+static bool dispel_check_monster(IDX m_idx, IDX t_idx)
226226 {
227227 monster_type *t_ptr = &m_list[t_idx];
228228
Show on old repository browser