diff options
Diffstat (limited to 'src/map/map.hpp')
| -rw-r--r-- | src/map/map.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index a2d0f5d..72d5dd3 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -77,6 +77,13 @@ struct block_list short bl_x, bl_y; BL bl_type; + // register keys are ints (interned) + // Not anymore! Well, sort of. + DMap<SIR, int> regm; + // can't be DMap because we want predictable .c_str()s + // TODO this can change now + Map<SIR, RString> regstrm; + // This deletes the copy-ctor also // TODO give proper ctors. block_list& operator = (block_list&&) = delete; @@ -251,13 +258,6 @@ struct map_session_data : block_list, SessionData int die_counter; - // register keys are ints (interned) - // Not anymore! Well, sort of. - DMap<SIR, int> regm; - // can't be DMap because we want predictable .c_str()s - // TODO this can change now - Map<SIR, RString> regstrm; - earray<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data; AccountId trade_partner; |