diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.cpp | 3 | ||||
| -rw-r--r-- | src/map/script-fun.cpp | 15 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index ea4552b..0c73b59 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -1237,7 +1237,8 @@ int map_setipport(MapName name, IP4Address ip, int port) mdos->gat = nullptr; mdos->ip = ip; mdos->port = port; - maps_db.put(mdos->name_, std::move(mdos)); + MapName mName = mdos->name_; + maps_db.put(mName, std::move(mdos)); } } OMATCH_END (); diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 3949627..8b797c2 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -66,21 +66,6 @@ namespace tmwa { namespace map { -static -Array<LString, 11> pos_str //= -{{ - "Head"_s, - "Body"_s, - "Left hand"_s, - "Right hand"_s, - "Robe"_s, - "Shoes"_s, - "Accessory 1"_s, - "Accessory 2"_s, - "Head 2"_s, - "Head 3"_s, - "Not Equipped"_s, -}}; #define AARG(n) (st->stack->stack_datav[st->start + 2 + (n)]) #define HARG(n) (st->end > st->start + 2 + (n)) |