OSDN Git Service

(root) / hengband / hengband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86b26df)
[Refactor] #37353 型の置換。 / Type replacement.
authorDeskull <deskull@users.sourceforge.jp>
Fri, 11 Jan 2019 04:16:42 +0000 (13:16 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Fri, 11 Jan 2019 04:16:42 +0000 (13:16 +0900)
src/cave.c patch | blob | history
src/object1.c patch | blob | history
src/report.c patch | blob | history
src/spells1.c patch | blob | history
src/store.c patch | blob | history

diff --git a/src/cave.c b/src/cave.c
index a921d35..76d30ee 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -1699,10 +1699,10 @@ void prt_map(void)
                for (x = xmin; x <= xmax; x++)
                {
                        TERM_COLOR a;
-                       char c;
+                       SYMBOL_CODE c;
 
                        TERM_COLOR ta;
-                       char tc;
+                       SYMBOL_CODE tc;
 
                        /* Determine what is there */
                        map_info(y, x, &a, &c, &ta, &tc);
diff --git a/src/object1.c b/src/object1.c
index 30cb285..b8dc981 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2043,7 +2043,7 @@ static void prepare_label_string(char *label, BIT_FLAGS mode)
        for (i = 0; i < 52; i++)
        {
                COMMAND_CODE index;
-               char c = alphabet_chars[i];
+               SYMBOL_CODE c = alphabet_chars[i];
 
                /* Find a tag with this label */
                if (get_tag(&index, c, mode))
@@ -2080,7 +2080,7 @@ static void prepare_label_string_floor(char *label, FLOOR_IDX floor_list[], ITEM
        for (i = 0; i < 52; i++)
        {
                COMMAND_CODE index;
-               char c = alphabet_chars[i];
+               SYMBOL_CODE c = alphabet_chars[i];
 
                /* Find a tag with this label */
                if (get_tag_floor(&index, c, floor_list, floor_num))
@@ -2225,8 +2225,8 @@ COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode)
                /* Display graphics for object, if desired */
                if (show_item_graph)
                {
-                       byte  a = object_attr(o_ptr);
-                       char c = object_char(o_ptr);
+                       TERM_COLOR a = object_attr(o_ptr);
+                       SYMBOL_CODE c = object_char(o_ptr);
                        Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0);
                        if (use_bigtile) cur_col++;
 
@@ -2397,8 +2397,8 @@ COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode)
                /* Display graphics for object, if desired */
                if (show_item_graph)
                {
-                       byte a = object_attr(o_ptr);
-                       char c = object_char(o_ptr);
+                       TERM_COLOR a = object_attr(o_ptr);
+                       SYMBOL_CODE c = object_char(o_ptr);
                        Term_queue_bigchar(cur_col, j + 1, a, c, 0, 0);
                        if (use_bigtile) cur_col++;
 
diff --git a/src/report.c b/src/report.c
index d9a56a9..792f48a 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -316,7 +316,7 @@ cptr make_screen_dump(void)
        cptr ret;
 
        TERM_COLOR a = 0, old_a = 0;
-       char c = ' ';
+       SYMBOL_CODE c = ' ';
 
        static cptr html_head[] = {
                "<html>\n<body text=\"#ffffff\" bgcolor=\"#000000\">\n",
diff --git a/src/spells1.c b/src/spells1.c
index 0ff9c49..800de00 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -6850,8 +6850,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -6989,7 +6989,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                        u16b p;
 
                                        TERM_COLOR a;
-                                       char c;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -7132,8 +7132,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                        {
                                u16b p;
 
-                               byte a;
-                               char c;
+                               TERM_COLOR a;
+                               SYMBOL_CODE c;
 
                                /* Obtain the bolt pict */
                                p = bolt_pict(oy, ox, y, x, typ);
@@ -7295,7 +7295,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                        u16b p;
 
                                        TERM_COLOR a;
-                                       char c;
+                                       SYMBOL_CODE c;
 
                                        drawn = TRUE;
 
diff --git a/src/store.c b/src/store.c
index 5298612..516386a 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -2245,8 +2245,8 @@ static void display_entry(int pos)
        cur_col = 3;
        if (show_item_graph)
        {
-               byte a = object_attr(o_ptr);
-               char c = object_char(o_ptr);
+               TERM_COLOR a = object_attr(o_ptr);
+               SYMBOL_CODE c = object_char(o_ptr);
 
                Term_queue_bigchar(cur_col, i + 6, a, c, 0, 0);
                if (use_bigtile) cur_col++;
変愚蛮怒のメインリポジトリです
About OSDN
Find Software
Develop Software
Help