From 83db3bbee4e19e7426a32ee89ad6c2d8e48260f2 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 18 Jun 2013 20:03:57 -0700 Subject: Also poison memcpy, memmove, and memset --- src/map/magic-stmt.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/map/magic-stmt.cpp') diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index f24167c..5d732c8 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -437,7 +437,6 @@ void entity_warp(dumb_ptr target, map_local *destm, int destx, int d case BL::PC: { dumb_ptr character = target->as_player(); - char *map_name; clif_clearchar(character, BeingRemoveWhy::WARPED); map_delblock(character); character->bl_x = destx; @@ -447,7 +446,7 @@ void entity_warp(dumb_ptr target, map_local *destm, int destx, int d pc_touch_all_relevant_npcs(character); // Note that touching NPCs may have triggered warping and thereby updated x and y: - map_name = character->bl_m->name; + const char *map_name = character->bl_m->name_; // Warp part #1: update relevant data, interrupt trading etc.: pc_setpos(character, map_name, character->bl_x, character->bl_y, BeingRemoveWhy::GONE); @@ -689,7 +688,7 @@ int op_spawn(dumb_ptr, const_array args) int mob_id; dumb_ptr mob; - mob_id = mob_once_spawn(owner, loc.m->name, loc.x, loc.y, "--ja--", // Is that needed? + mob_id = mob_once_spawn(owner, loc.m->name_, loc.x, loc.y, "--ja--", // Is that needed? monster_id, 1, ""); mob = map_id_as_mob(mob_id); -- cgit v1.2.3-70-g09d2