OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

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


Commit MetaInfo

Revisiona55fcffc6673dd5b7a79f87233961be0f4533b83 (tree)
Time2017-12-02 18:41:58
AuthorDeskull <desull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2512,7 +2512,7 @@ void do_cmd_walk(bool pickup)
25122512 }
25132513
25142514 /* Get a "repeated" direction */
2515- if (get_rep_dir(&dir,FALSE))
2515+ if (get_rep_dir(&dir, FALSE))
25162516 {
25172517 /* Take a turn */
25182518 p_ptr->energy_use = 100;
--- a/src/externs.h
+++ b/src/externs.h
@@ -1505,7 +1505,7 @@ extern bool target_set(int mode);
15051505 extern void target_set_prepare_look(void);
15061506 extern bool get_aim_dir(DIRECTION *dp);
15071507 extern bool get_hack_dir(int *dp);
1508-extern bool get_rep_dir(int *dp, bool under);
1508+extern bool get_rep_dir(DIRECTION *dp, bool under);
15091509 extern bool get_rep_dir2(int *dp);
15101510 extern void gain_level_reward(int chosen_reward);
15111511 extern bool tgt_pt(POSITION *x, POSITION *y);
--- a/src/init1.c
+++ b/src/init1.c
@@ -3071,10 +3071,10 @@ errr parse_r_info(char *buf, header *head)
30713071 if (*t == 'd') *t++ = '\0';
30723072
30733073 /* Save the method */
3074- r_ptr->blow[i].method = n1;
3074+ r_ptr->blow[i].method = (BLOW_METHOD)n1;
30753075
30763076 /* Save the effect */
3077- r_ptr->blow[i].effect = n2;
3077+ r_ptr->blow[i].effect = (BLOW_EFFECT)n2;
30783078
30793079 /* Extract the damage dice and sides */
30803080 r_ptr->blow[i].d_dice = atoi(s);
@@ -4230,13 +4230,13 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
42304230 if (num < 9) return (PARSE_ERROR_TOO_FEW_ARGUMENTS);
42314231
42324232 q_ptr->type = atoi(zz[2]);
4233- q_ptr->num_mon = atoi(zz[3]);
4234- q_ptr->cur_num = atoi(zz[4]);
4235- q_ptr->max_num = atoi(zz[5]);
4236- q_ptr->level = atoi(zz[6]);
4233+ q_ptr->num_mon = (MONSTER_NUMBER)atoi(zz[3]);
4234+ q_ptr->cur_num = (MONSTER_NUMBER)atoi(zz[4]);
4235+ q_ptr->max_num = (MONSTER_NUMBER)atoi(zz[5]);
4236+ q_ptr->level = (DEPTH)atoi(zz[6]);
42374237 q_ptr->r_idx = (IDX)atoi(zz[7]);
42384238 q_ptr->k_idx = (IDX)atoi(zz[8]);
4239- q_ptr->dungeon = atoi(zz[9]);
4239+ q_ptr->dungeon = (DUNGEON_IDX)atoi(zz[9]);
42404240
42414241 if (num > 10)
42424242 q_ptr->flags = atoi(zz[10]);
--- a/src/init2.c
+++ b/src/init2.c
@@ -1978,7 +1978,7 @@ static errr init_object_alloc(void)
19781978 z = y + aux[x];
19791979
19801980 /* Load the entry */
1981- table[z].index = i;
1981+ table[z].index = (KIND_OBJECT_IDX)i;
19821982 table[z].level = (DEPTH)x;
19831983 table[z].prob1 = (PROB)p;
19841984 table[z].prob2 = (PROB)p;
@@ -2047,7 +2047,7 @@ static errr init_alloc(void)
20472047 p = (100 / r_ptr->rarity);
20482048
20492049 /* Load the entry */
2050- alloc_race_table[i].index = elements[i].index;
2050+ alloc_race_table[i].index = (KIND_OBJECT_IDX)elements[i].index;
20512051 alloc_race_table[i].level = (DEPTH)x;
20522052 alloc_race_table[i].prob1 = (PROB)p;
20532053 alloc_race_table[i].prob2 = (PROB)p;
--- a/src/load.c
+++ b/src/load.c
@@ -3579,7 +3579,8 @@ static errr rd_savefile_new_aux(void)
35793579 }
35803580 else
35813581 {
3582- rd_byte(&q_ptr->complev);
3582+ rd_byte(&tmp8u);
3583+ q_ptr->complev = tmp8u;
35833584 }
35843585 if(h_older_than(2, 1, 2, 2))
35853586 {
@@ -3615,7 +3616,8 @@ static errr rd_savefile_new_aux(void)
36153616 if (q_ptr->k_idx)
36163617 a_info[q_ptr->k_idx].gen_flags |= TRG_QUESTITEM;
36173618
3618- rd_byte(&q_ptr->flags);
3619+ rd_byte(&tmp8u);
3620+ q_ptr->flags = tmp8u;
36193621
36203622 if (z_older_than(10, 3, 11))
36213623 {
@@ -3634,7 +3636,8 @@ static errr rd_savefile_new_aux(void)
36343636 }
36353637 else
36363638 {
3637- rd_byte(&q_ptr->dungeon);
3639+ rd_byte(&tmp8u);
3640+ q_ptr->dungeon = tmp8u;
36383641 }
36393642 /* Mark uniques */
36403643 if (q_ptr->status == QUEST_STATUS_TAKEN || q_ptr->status == QUEST_STATUS_UNTAKEN)
--- a/src/object1.c
+++ b/src/object1.c
@@ -3631,8 +3631,8 @@ int scan_floor(int *items, POSITION y, POSITION x, int mode)
36313631 */
36323632 COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_POSITION *min_width)
36333633 {
3634- COMMAND_CODE i;
3635- int j, k, l, m;
3634+ COMMAND_CODE i, m;
3635+ int j, k, l;
36363636 int col, len;
36373637
36383638 object_type *o_ptr;
--- a/src/types.h
+++ b/src/types.h
@@ -635,7 +635,7 @@ typedef struct alloc_entry alloc_entry;
635635
636636 struct alloc_entry
637637 {
638- IDX index; /* The actual index */
638+ KIND_OBJECT_IDX index; /* The actual index */
639639
640640 DEPTH level; /* Base dungeon level */
641641 PROB prob1; /* Probability, pass 1 */
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -745,16 +745,17 @@ void strip_name(char *buf, KIND_OBJECT_IDX k_idx)
745745 * This function returns the k_idx of an object type, or zero if failed
746746 * List up to 50 choices in three columns
747747 */
748-static IDX wiz_create_itemtype(void)
748+static KIND_OBJECT_IDX wiz_create_itemtype(void)
749749 {
750- int i, num, max_num;
751- int col, row;
750+ KIND_OBJECT_IDX i;
751+ int num, max_num;
752+ TERM_POSITION col, row;
752753 OBJECT_TYPE_VALUE tval;
753754
754755 cptr tval_desc;
755756 char ch;
756757
757- int choice[80];
758+ KIND_OBJECT_IDX choice[80];
758759
759760 char buf[160];
760761
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -4235,9 +4235,9 @@ bool get_aim_dir(DIRECTION *dp)
42354235 * This function tracks and uses the "global direction", and uses
42364236 * that as the "desired direction", to which "confusion" is applied.
42374237 */
4238-bool get_rep_dir(int *dp, bool under)
4238+bool get_rep_dir(DIRECTION *dp, bool under)
42394239 {
4240- int dir;
4240+ DIRECTION dir;
42414241 cptr prompt;
42424242
42434243 /* Initialize */
Show on old repository browser