• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision42bc9dc48b029c39ff4348528d1a70db1557ed23 (tree)
Time2019-02-13 21:31:01
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Fix] #37353 型の修正。 / Fix type.

Change Summary

Incremental Difference

--- a/src/cave.c
+++ b/src/cave.c
@@ -941,7 +941,7 @@ void apply_default_feat_lighting(TERM_COLOR f_attr[F_LIT_MAX], SYMBOL_CODE f_cha
941941 * "x_ptr->xxx", is quicker than "x_info[x].xxx", if this is incorrect\n
942942 * then a whole lot of code should be changed... XXX XXX\n
943943 */
944-void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap, SYMBOL_CODE *tcp)
944+void map_info(POSITION y, POSITION x, TERM_COLOR *ap, SYMBOL_CODE *cp, TERM_COLOR *tap, SYMBOL_CODE *tcp)
945945 {
946946 /* Get the grid_array */
947947 grid_type *g_ptr = &grid_array[y][x];
--- a/src/externs.h
+++ b/src/externs.h
@@ -464,11 +464,11 @@ extern void get_height_weight(void);
464464 extern void player_outfit(void);
465465 extern void dump_yourself(FILE *fff);
466466
467-/* grid_array.c */
467+/* grids.c */
468468 extern POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
469-extern bool is_trap(IDX feat);
469+extern bool is_trap(FEAT_IDX feat);
470470 extern bool is_known_trap(grid_type *g_ptr);
471-extern bool is_closed_door(IDX feat);
471+extern bool is_closed_door(FEAT_IDX feat);
472472 extern bool is_hidden_door(grid_type *g_ptr);
473473 extern bool los(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
474474 extern void update_local_illumination(POSITION y, POSITION x);
@@ -476,7 +476,7 @@ extern bool player_can_see_bold(POSITION y, POSITION x);
476476 extern bool cave_valid_bold(POSITION y, POSITION x);
477477 extern bool no_lite(void);
478478 extern void apply_default_feat_lighting(TERM_COLOR f_attr[F_LIT_MAX], SYMBOL_CODE f_char[F_LIT_MAX]);
479-extern void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap, char *tcp);
479+extern void map_info(POSITION y, POSITION x, TERM_COLOR *ap, SYMBOL_CODE *cp, TERM_COLOR *tap, SYMBOL_CODE *tcp);
480480 extern void move_cursor_relative(int row, int col);
481481 extern void print_rel(SYMBOL_CODE c, TERM_COLOR a, TERM_LEN y, TERM_LEN x);
482482 extern void note_spot(POSITION y, POSITION x);
@@ -501,7 +501,7 @@ extern void wiz_lite(bool ninja);
501501 extern void wiz_dark(void);
502502 extern void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat);
503503 extern FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat);
504-extern FEAT_IDX feat_state(IDX feat, int action);
504+extern FEAT_IDX feat_state(FEAT_IDX feat, int action);
505505 extern void cave_alter_feat(POSITION y, POSITION x, int action);
506506 extern void remove_mirror(POSITION y, POSITION x);
507507 extern bool is_mirror_grid(grid_type *g_ptr);
@@ -675,7 +675,7 @@ extern bool build_tunnel2(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in
675675
676676
677677 /* init1.c */
678-extern byte color_char_to_attr(char c);
678+extern TERM_COLOR color_char_to_attr(SYMBOL_CODE c);
679679 extern s16b f_tag_to_index(concptr str);
680680 extern errr process_dungeon_file(concptr name, int ymin, int xmin, int ymax, int xmax);
681681
--- a/src/init1.c
+++ b/src/init1.c
@@ -1140,7 +1140,7 @@ static bool add_tag(STR_OFFSET *offset, header *head, concptr buf)
11401140 * @param c シンボル文字
11411141 * @return カラーID
11421142 */
1143-byte color_char_to_attr(char c)
1143+TERM_COLOR color_char_to_attr(SYMBOL_CODE c)
11441144 {
11451145 switch (c)
11461146 {
Show on old repository browser