diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-24 18:30:58 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-25 13:49:20 -0700 |
| commit | c9c81a610d97c95c15f938ecd07ceb71cb0cdfb1 (patch) | |
| tree | 7637cf53216c6d0b8deadbfb8ea56faf4ff5bc85 /src/map/map.hpp | |
| parent | dbbfda0e96037da4f208ff8f00d181a5294484ae (diff) | |
| download | tmwa-c9c81a610d97c95c15f938ecd07ceb71cb0cdfb1.tar.gz tmwa-c9c81a610d97c95c15f938ecd07ceb71cb0cdfb1.tar.bz2 tmwa-c9c81a610d97c95c15f938ecd07ceb71cb0cdfb1.tar.xz tmwa-c9c81a610d97c95c15f938ecd07ceb71cb0cdfb1.zip | |
Fix bugs
Diffstat (limited to 'src/map/map.hpp')
| -rw-r--r-- | src/map/map.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index cf52173..e315492 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -232,9 +232,11 @@ struct map_session_data : block_list, SessionData int die_counter; // register keys are ints (interned) - DMap<int, int> regm; + // Not anymore! Well, sort of. + DMap<SIR, int> regm; // can't be DMap because we want predictable .c_str()s - Map<int, std::string> regstrm; + // This could change once FString ensures CoW. + Map<SIR, std::string> regstrm; earray<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data; short sc_count; @@ -591,7 +593,7 @@ void map_log(const_string line); #define MAP_LOG_PC(sd, fmt, ...) \ MAP_LOG("PC%d %s:%d,%d " fmt, \ - sd->status.char_id, sd->bl_m->name_, sd->bl_x, sd->bl_y, ## __VA_ARGS__) + sd->status.char_id, (sd->bl_m ? sd->bl_m->name_ : "undefined"), sd->bl_x, sd->bl_y, ## __VA_ARGS__) // 床アイテム関連 void map_clearflooritem_timer(TimerData *, tick_t, int); |