diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 13:58:57 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 13:58:57 -0700 |
| commit | 543e4b419239f37321bc5a224d56773d1fe6ebfe (patch) | |
| tree | b1af74736f9ecaf4e7b7770c9fbff59e971d3f4b /src/map/map.hpp | |
| parent | cce12d0d059b3328ad74446b389445bd43e0a90b (diff) | |
| download | tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.gz tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.bz2 tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.xz tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.zip | |
Rename fields of block_list in preparation for subclassing
This is necessary because at least some of the subclasses overlap names.
Diffstat (limited to 'src/map/map.hpp')
| -rw-r--r-- | src/map/map.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index ae96eb3..ff8da3a 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -37,11 +37,10 @@ constexpr interval_t DEFAULT_AUTOSAVE_INTERVAL = std::chrono::minutes(1); struct block_list { - struct block_list *next, *prev; - int id; - short m, x, y; - BL type; - NpcSubtype subtype; + struct block_list *bl_next, *bl_prev; + int bl_id; + short bl_m, bl_x, bl_y; + BL bl_type; }; struct walkpath_data @@ -281,6 +280,7 @@ struct npc_item_list struct npc_data { struct block_list bl; + NpcSubtype npc_subtype; short n; short npc_class; DIR dir; @@ -535,7 +535,7 @@ void map_log(const_string line); #define MAP_LOG_PC(sd, fmt, ...) \ MAP_LOG("PC%d %d:%d,%d " fmt, \ - sd->status.char_id, sd->bl.m, sd->bl.x, sd->bl.y, ## __VA_ARGS__) + sd->status.char_id, sd->bl.bl_m, sd->bl.bl_x, sd->bl.bl_y, ## __VA_ARGS__) // 床アイテム関連 void map_clearflooritem_timer(TimerData *, tick_t, int); |