summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.cpp4
-rw-r--r--src/map/npc-parse.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 4dd80bb..123a723 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -4102,10 +4102,10 @@ ATCE atcommand_pvp(Session *s, dumb_ptr<map_session_data> sd,
if (chan < 1) {
sd->state.pvpchannel = 1;
- clif_displaymessage(s, "PvP : ##3##BOn"_s);
+ clif_displaymessage(s, "Server : ##3##BPvP ##3##BOn"_s);
} else {
sd->state.pvpchannel = 0;
- clif_displaymessage(s, "PvP : ##3##BOff"_s);
+ clif_displaymessage(s, "Server : ##3##BPvP ##3##BOff"_s);
}
sd->state.pvp_rank = 0;
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp
index 9ee84d2..0bd23a9 100644
--- a/src/map/npc-parse.cpp
+++ b/src/map/npc-parse.cpp
@@ -153,7 +153,7 @@ bool npc_load_warp(ast::npc::Warp& warp)
nd->dir = DIR::S;
nd->flag = 0;
nd->sit = DamageType::STAND;
- nd->name = warp.name.data;
+ nd->name = stringish<NpcName>(STRPRINTF("w%c%i"_fmt, 6, nd->bl_id));
nd->npc_class = WARP_CLASS;
nd->speed = 200_ms;