変愚蛮怒のメインリポジトリです
Revision | f3f4844b6011a4b70c13a9060ee9ca8c278fcc47 (tree) |
---|---|
Time | 2019-05-21 00:05:55 |
Author | deskull <deskull@user...> |
Commiter | deskull |
[Refactor] #37353 object_attr マクロを object.h へ移動.
@@ -2357,18 +2357,6 @@ | ||
2357 | 2357 | #define term_screen (angband_term[0]) |
2358 | 2358 | |
2359 | 2359 | /* |
2360 | - * Return the "attr" for a given item. | |
2361 | - * Use "flavor" if available. | |
2362 | - * Default to user definitions. | |
2363 | - */ | |
2364 | -#define object_attr(T) \ | |
2365 | - ((k_info[(T)->k_idx].flavor) ? \ | |
2366 | - (k_info[k_info[(T)->k_idx].flavor].x_attr) : \ | |
2367 | - ((!(T)->k_idx || ((T)->tval != TV_CORPSE) || ((T)->sval != SV_CORPSE) || \ | |
2368 | - (k_info[(T)->k_idx].x_attr != TERM_DARK)) ? \ | |
2369 | - (k_info[(T)->k_idx].x_attr) : (r_info[(T)->pval].x_attr))) | |
2370 | - | |
2371 | -/* | |
2372 | 2360 | * Return the "char" for a given item. |
2373 | 2361 | * Use "flavor" if available. |
2374 | 2362 | * Default to user definitions. |
@@ -186,3 +186,16 @@ extern s32b flag_cost(object_type *o_ptr, int plusses); | ||
186 | 186 | |
187 | 187 | extern bool get_item_floor(COMMAND_CODE *cp, concptr pmt, concptr str, BIT_FLAGS mode); |
188 | 188 | extern void py_pickup_floor(bool pickup); |
189 | + | |
190 | +/* | |
191 | + * Return the "attr" for a given item. | |
192 | + * Use "flavor" if available. | |
193 | + * Default to user definitions. | |
194 | + */ | |
195 | +#define object_attr(T) \ | |
196 | + ((k_info[(T)->k_idx].flavor) ? \ | |
197 | + (k_info[k_info[(T)->k_idx].flavor].x_attr) : \ | |
198 | + ((!(T)->k_idx || ((T)->tval != TV_CORPSE) || ((T)->sval != SV_CORPSE) || \ | |
199 | + (k_info[(T)->k_idx].x_attr != TERM_DARK)) ? \ | |
200 | + (k_info[(T)->k_idx].x_attr) : (r_info[(T)->pval].x_attr))) | |
201 | + |