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

hengband: Commit

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


Commit MetaInfo

Revisiondeb5325f20bd8572942cbcb6649daf09c5cb2e83 (tree)
Time2017-12-20 22:13:09
AuthorDeskull <desull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/util.c
+++ b/src/util.c
@@ -3805,10 +3805,11 @@ bool get_com(cptr prompt, char *command, bool z_escape)
38053805 */
38063806 QUANTITY get_quantity(cptr prompt, QUANTITY max)
38073807 {
3808- bool res;
3808+ bool res, result;
38093809 QUANTITY amt;
38103810 char tmp[80];
38113811 char buf[80];
3812+ COMMAND_CODE code;
38123813
38133814
38143815 /* Use "command_arg" */
@@ -3830,7 +3831,9 @@ QUANTITY get_quantity(cptr prompt, QUANTITY max)
38303831 #ifdef ALLOW_REPEAT /* TNB */
38313832
38323833 /* Get the item index */
3833- if ((max != 1) && repeat_pull(&amt))
3834+ result = repeat_pull(&code);
3835+ amt = (QUANTITY)code;
3836+ if ((max != 1) && result)
38343837 {
38353838 /* Enforce the maximum */
38363839 if (amt > max) amt = max;
@@ -3892,7 +3895,7 @@ QUANTITY get_quantity(cptr prompt, QUANTITY max)
38923895
38933896 #ifdef ALLOW_REPEAT /* TNB */
38943897
3895- if (amt) repeat_push(amt);
3898+ if (amt) repeat_push((COMMAND_CODE)amt);
38963899
38973900 #endif /* ALLOW_REPEAT -- TNB */
38983901
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -4091,6 +4091,7 @@ bool get_aim_dir(DIRECTION *dp)
40914091 DIRECTION dir;
40924092 char command;
40934093 cptr p;
4094+ COMMAND_CODE code;
40944095
40954096 /* Initialize */
40964097 (*dp) = 0;
@@ -4103,17 +4104,18 @@ bool get_aim_dir(DIRECTION *dp)
41034104
41044105 #ifdef ALLOW_REPEAT /* TNB */
41054106
4106- if (repeat_pull(dp))
4107+ if (repeat_pull(&code))
41074108 {
41084109 /* Confusion? */
41094110
41104111 /* Verify */
4111- if (!(*dp == 5 && !target_okay()))
4112+ if (!(code == 5 && !target_okay()))
41124113 {
41134114 /* return (TRUE); */
4114- dir = *dp;
4115+ dir = (DIRECTION)code;
41154116 }
41164117 }
4118+ *dp = (DIRECTION)code;
41174119
41184120 #endif /* ALLOW_REPEAT -- TNB */
41194121
@@ -4208,7 +4210,7 @@ bool get_aim_dir(DIRECTION *dp)
42084210 #ifdef ALLOW_REPEAT /* TNB */
42094211
42104212 /* repeat_push(dir); */
4211- repeat_push(command_dir);
4213+ repeat_push((COMMAND_CODE)command_dir);
42124214
42134215 #endif /* ALLOW_REPEAT -- TNB */
42144216
@@ -4238,6 +4240,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
42384240 {
42394241 DIRECTION dir;
42404242 cptr prompt;
4243+ COMMAND_CODE code;
42414244
42424245 /* Initialize */
42434246 (*dp) = 0;
@@ -4247,11 +4250,12 @@ bool get_rep_dir(DIRECTION *dp, bool under)
42474250
42484251 #ifdef ALLOW_REPEAT /* TNB */
42494252
4250- if (repeat_pull(dp))
4253+ if (repeat_pull(&code))
42514254 {
4252- dir = *dp;
4255+ dir = (DIRECTION)code;
42534256 /* return (TRUE); */
42544257 }
4258+ *dp = (DIRECTION)code;
42554259
42564260 #endif /* ALLOW_REPEAT -- TNB */
42574261
@@ -4363,7 +4367,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
43634367 #ifdef ALLOW_REPEAT /* TNB */
43644368
43654369 /* repeat_push(dir); */
4366- repeat_push(command_dir);
4370+ repeat_push((COMMAND_CODE)command_dir);
43674371
43684372 #endif /* ALLOW_REPEAT -- TNB */
43694373
@@ -4375,6 +4379,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
43754379 bool get_rep_dir2(DIRECTION *dp)
43764380 {
43774381 DIRECTION dir;
4382+ COMMAND_CODE code;
43784383
43794384 /* Initialize */
43804385 (*dp) = 0;
@@ -4384,11 +4389,12 @@ bool get_rep_dir2(DIRECTION *dp)
43844389
43854390 #ifdef ALLOW_REPEAT /* TNB */
43864391
4387- if (repeat_pull(dp))
4392+ if (repeat_pull(&code))
43884393 {
4389- dir = *dp;
4394+ dir = (DIRECTION)code;
43904395 /* return (TRUE); */
43914396 }
4397+ *dp = (DIRECTION)code;
43924398
43934399 #endif /* ALLOW_REPEAT -- TNB */
43944400
@@ -4440,7 +4446,7 @@ bool get_rep_dir2(DIRECTION *dp)
44404446 #ifdef ALLOW_REPEAT /* TNB */
44414447
44424448 /* repeat_push(dir); */
4443- repeat_push(command_dir);
4449+ repeat_push((COMMAND_CODE)command_dir);
44444450
44454451 #endif /* ALLOW_REPEAT -- TNB */
44464452
Show on old repository browser