変愚蛮怒のメインリポジトリです
Revision | 50cb96556693005e66c513689ebd3186868ca941 (tree) |
---|---|
Time | 2017-10-01 20:33:58 |
Author | Deskull <desull@user...> |
Commiter | Deskull |
@@ -3294,7 +3294,7 @@ static int repair_broken_weapon_aux(int bcost) | ||
3294 | 3294 | else /* TV_BROKEN_SWORD */ |
3295 | 3295 | { |
3296 | 3296 | /* 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); | |
3298 | 3298 | |
3299 | 3299 | while(1) |
3300 | 3300 | { |
@@ -3477,7 +3477,7 @@ void do_cmd_visuals(void) | ||
3477 | 3477 | case '5': |
3478 | 3478 | { |
3479 | 3479 | static cptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars"); |
3480 | - static int k = 0; | |
3480 | + static IDX k = 0; | |
3481 | 3481 | prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); |
3482 | 3482 | |
3483 | 3483 | /* Hack -- query until done */ |
@@ -5619,7 +5619,7 @@ static void do_cmd_knowledge_uniques(void) | ||
5619 | 5619 | { |
5620 | 5620 | int i, k, n = 0; |
5621 | 5621 | u16b why = 2; |
5622 | - s16b *who; | |
5622 | + IDX *who; | |
5623 | 5623 | |
5624 | 5624 | FILE *fff; |
5625 | 5625 |
@@ -7452,7 +7452,7 @@ static void display_feature_list(int col, int row, int per_page, int *feat_idx, | ||
7452 | 7452 | /* |
7453 | 7453 | * Interact with feature visuals. |
7454 | 7454 | */ |
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) | |
7456 | 7456 | { |
7457 | 7457 | IDX i; |
7458 | 7458 | int len, max; |
@@ -7486,7 +7486,7 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, int d | ||
7486 | 7486 | browser_rows = hgt - 8; |
7487 | 7487 | |
7488 | 7488 | /* Allocate the "feat_idx" array */ |
7489 | - C_MAKE(feat_idx, max_f_idx, int); | |
7489 | + C_MAKE(feat_idx, max_f_idx, IDX); | |
7490 | 7490 | |
7491 | 7491 | max = 0; |
7492 | 7492 | grp_cnt = 0; |
@@ -8342,7 +8342,8 @@ static void do_cmd_knowledge_quests(void) | ||
8342 | 8342 | FILE *fff; |
8343 | 8343 | char file_name[1024]; |
8344 | 8344 | IDX *quest_num; |
8345 | - int dummy, i; | |
8345 | + int dummy; | |
8346 | + IDX i; | |
8346 | 8347 | |
8347 | 8348 | /* Open a new file */ |
8348 | 8349 | fff = my_fopen_temp(file_name, 1024); |
@@ -1051,7 +1051,9 @@ static void wild_magic(int spell) | ||
1051 | 1051 | */ |
1052 | 1052 | void do_cmd_cast(void) |
1053 | 1053 | { |
1054 | - int item, sval, spell, realm; | |
1054 | + int item; | |
1055 | + OBJECT_SUBTYPE_VALUE sval; | |
1056 | + int spell, realm; | |
1055 | 1057 | int chance; |
1056 | 1058 | int increment = 0; |
1057 | 1059 | int use_realm; |
@@ -2585,7 +2585,7 @@ static int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool m | ||
2585 | 2585 | if (sval == SV_WAND_WONDER) |
2586 | 2586 | { |
2587 | 2587 | int vir = virtue_number(V_CHANCE); |
2588 | - sval = randint0(SV_WAND_WONDER); | |
2588 | + sval = (OBJECT_SUBTYPE_VALUE)randint0(SV_WAND_WONDER); | |
2589 | 2589 | |
2590 | 2590 | if (vir) |
2591 | 2591 | { |
@@ -4424,7 +4424,7 @@ static void dump_aux_class_special(FILE *fff) | ||
4424 | 4424 | */ |
4425 | 4425 | static void dump_aux_quest(FILE *fff) |
4426 | 4426 | { |
4427 | - int i; | |
4427 | + IDX i; | |
4428 | 4428 | IDX *quest_num; |
4429 | 4429 | int dummy; |
4430 | 4430 |
@@ -1441,9 +1441,11 @@ static bool adjacent_grid_check(monster_type *m_ptr, POSITION *yp, POSITION *xp, | ||
1441 | 1441 | */ |
1442 | 1442 | bool make_attack_spell(IDX m_idx) |
1443 | 1443 | { |
1444 | - int k, thrown_spell = 0, rlev, failrate; | |
1444 | + int k, thrown_spell = 0; | |
1445 | + DEPTH rlev; | |
1446 | + PERCENTAGE failrate; | |
1445 | 1447 | byte spell[96], num = 0; |
1446 | - u32b f4, f5, f6; | |
1448 | + BIT_FLAGS f4, f5, f6; | |
1447 | 1449 | monster_type *m_ptr = &m_list[m_idx]; |
1448 | 1450 | monster_race *r_ptr = &r_info[m_ptr->r_idx]; |
1449 | 1451 | char m_name[80]; |
@@ -222,7 +222,7 @@ void get_project_point(int sy, int sx, int *ty, int *tx, int flg) | ||
222 | 222 | * @param t_idx 目標のモンスターID |
223 | 223 | * @return 魔力消去を使うべきならばTRUEを変えす。 |
224 | 224 | */ |
225 | -static bool dispel_check_monster(int m_idx, int t_idx) | |
225 | +static bool dispel_check_monster(IDX m_idx, IDX t_idx) | |
226 | 226 | { |
227 | 227 | monster_type *t_ptr = &m_list[t_idx]; |
228 | 228 |