diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-14 11:02:47 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-14 11:32:36 -0700 |
| commit | 56e149a51562b9d2620bc9037a81735c29ea95af (patch) | |
| tree | 3a4bd218f69c5cbfec0dd8dcada34413c0ddc715 /src/map/map.hpp | |
| parent | 1a1bfc8fd8a3613bf7d3c320dcaff29a9402f50c (diff) | |
| download | tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.tar.gz tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.tar.bz2 tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.tar.xz tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.zip | |
Ditch gcc 4.6 support
Diffstat (limited to 'src/map/map.hpp')
| -rw-r--r-- | src/map/map.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index 0cec5e8..6d945d0 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -91,7 +91,7 @@ struct NpcEvent friend VString<49> convert_for_printf(NpcEvent ev) { - return STRNPRINTF(50, "%s::%s", ev.npc, ev.label); + return STRNPRINTF(50, "%s::%s"_fmt, ev.npc, ev.label); } }; bool extract(XString str, NpcEvent *ev); @@ -623,7 +623,7 @@ void map_log(XString line); # define MAP_LOG_PC(sd, fmt, ...) \ MAP_LOG("PC%d %s:%d,%d " fmt, \ - sd->status_key.char_id, (sd->bl_m ? sd->bl_m->name_ : stringish<MapName>("undefined.gat")), sd->bl_x, sd->bl_y, ## __VA_ARGS__) + sd->status_key.char_id, (sd->bl_m ? sd->bl_m->name_ : stringish<MapName>("undefined.gat"_s)), sd->bl_x, sd->bl_y, ## __VA_ARGS__) // 床アイテム関連 void map_clearflooritem_timer(TimerData *, tick_t, int); |