• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisión0ab66085b181d0d4169985827efe930306a461a1 (tree)
Tiempo2017-10-19 21:45:54
AutorDeskull <desull@user...>
CommiterDeskull

Log Message

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

Cambiar Resumen

Diferencia incremental

--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -221,7 +221,7 @@ bool select_ring_slot = FALSE;
221221 */
222222 void do_cmd_wield(void)
223223 {
224- int item, slot;
224+ OBJECT_IDX item, slot;
225225
226226 object_type forge;
227227 object_type *q_ptr;
--- a/src/externs.h
+++ b/src/externs.h
@@ -1018,7 +1018,7 @@ extern int show_inven(int target_item);
10181018 extern int show_equip(int target_item);
10191019 extern void toggle_inven_equip(void);
10201020 extern bool can_get_item(void);
1021-extern bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode);
1021+extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode);
10221022
10231023 /* object2.c */
10241024 extern void excise_object_idx(int o_idx);
--- a/src/object1.c
+++ b/src/object1.c
@@ -2629,7 +2629,7 @@ static bool get_item_allow(int item)
26292629 * @param i 選択アイテムID
26302630 * @return 正規のIDならばTRUEを返す。
26312631 */
2632-static bool get_item_okay(int i)
2632+static bool get_item_okay(OBJECT_IDX i)
26332633 {
26342634 /* Illegal items */
26352635 if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE);
@@ -2719,16 +2719,16 @@ bool can_get_item(void)
27192719 * We always erase the prompt when we are done, leaving a blank line,\n
27202720 * or a warning message, if appropriate, if no items are available.\n
27212721 */
2722-bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
2722+bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode)
27232723 {
27242724 OBJECT_IDX this_o_idx, next_o_idx = 0;
27252725
27262726 char which = ' ';
27272727
27282728 int j;
2729- COMMAND_CODE k;
2730- COMMAND_CODE i1, i2;
2731- COMMAND_CODE e1, e2;
2729+ OBJECT_IDX k;
2730+ OBJECT_IDX i1, i2;
2731+ OBJECT_IDX e1, e2;
27322732
27332733 bool done, item;
27342734
Show on old repository browser