From 1eba90a65bd93a8ecabc8c501ae61c7cd4e34544 Mon Sep 17 00:00:00 2001 From: FrancescoBorzi Date: Wed, 15 Sep 2021 15:08:04 +0200 Subject: [PATCH] chore: addition to my previous commit --- modules/mod-as-platform/src/AZTH_SC.cpp | 2 +- modules/mod-smartstone/src/scripts/AzthSmartStone.cpp | 2 +- modules/mod-smartstone/src/scripts/Misc.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mod-as-platform/src/AZTH_SC.cpp b/modules/mod-as-platform/src/AZTH_SC.cpp index ea0eaa6..1dae397 100644 --- a/modules/mod-as-platform/src/AZTH_SC.cpp +++ b/modules/mod-as-platform/src/AZTH_SC.cpp @@ -1612,7 +1612,7 @@ public: else // save only in non-flight case player->SaveRecallPosition(); - if (!MapManager::IsValidMapCoord(map, x, y, z)) + if (!MapMgr::IsValidMapCoord(map, x, y, z)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, map); handler->SetSentErrorMessage(true); diff --git a/modules/mod-smartstone/src/scripts/AzthSmartStone.cpp b/modules/mod-smartstone/src/scripts/AzthSmartStone.cpp index a2695df..668fd9a 100644 --- a/modules/mod-smartstone/src/scripts/AzthSmartStone.cpp +++ b/modules/mod-smartstone/src/scripts/AzthSmartStone.cpp @@ -290,7 +290,7 @@ public: if (sAZTH->GetAZTHPlayer(player)->getCurrentDimensionByAura() == DIMENSION_RPG) { Player *owner=getHomeOwner(player); - if (MapManager::IsValidMapCoord(sAZTH->GetAZTHPlayer(owner)->getLastPositionInfo(AZTH_SMRTST_POSITION_HOUSE_INDEX))) { + if (MapMgr::IsValidMapCoord(sAZTH->GetAZTHPlayer(owner)->getLastPositionInfo(AZTH_SMRTST_POSITION_HOUSE_INDEX))) { // home teleport for RPG world SmartStoneCommand homeTeleport = sSmartStone->getCommandById(SMRTST_TELEPORT_HOUSE); std::string str=homeTeleport.getText(player) + " (" +owner->GetName()+")"; diff --git a/modules/mod-smartstone/src/scripts/Misc.cpp b/modules/mod-smartstone/src/scripts/Misc.cpp index a4bdd4a..728827d 100644 --- a/modules/mod-smartstone/src/scripts/Misc.cpp +++ b/modules/mod-smartstone/src/scripts/Misc.cpp @@ -16,7 +16,7 @@ void SmartStoneApps::blackMarketTeleport(Player *player) { } else { WorldLocation const& pos = sAZTH->GetAZTHPlayer(player)->getLastPositionInfo(sAZTH->GetAZTHPlayer(player)->getCurrentDimensionByAura()); - if (!MapManager::IsValidMapCoord(pos)) + if (!MapMgr::IsValidMapCoord(pos)) return; Map *m = sMapMgr->FindBaseMap(pos.GetMapId()); @@ -38,7 +38,7 @@ void SmartStoneApps::teleportHouse(Player *owner, Player *guest) { return; WorldLocation const& pos = sAZTH->GetAZTHPlayer(owner)->getLastPositionInfo(AZTH_SMRTST_POSITION_HOUSE_INDEX); - if (!MapManager::IsValidMapCoord(pos)) + if (!MapMgr::IsValidMapCoord(pos)) return; guest->TeleportTo(pos);