diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-06-18 23:41:58 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:45:05 -0400 |
| commit | 98e5e62ef7a04977146fdbfbc3166dad5d082da0 (patch) | |
| tree | f0ff9a10b07439786994887e406519bc86860a16 /src/map/map.hpp | |
| parent | ef4ae4d281127a0b84a73ab034bd22d6281a09ed (diff) | |
| download | tmwa-98e5e62ef7a04977146fdbfbc3166dad5d082da0.tar.gz tmwa-98e5e62ef7a04977146fdbfbc3166dad5d082da0.tar.bz2 tmwa-98e5e62ef7a04977146fdbfbc3166dad5d082da0.tar.xz tmwa-98e5e62ef7a04977146fdbfbc3166dad5d082da0.zip | |
add scope, npc/mob variables; add new get/set
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; |