From 32f4722c0fd19e00adf17d75a547c25af893e76a Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sun, 20 Sep 2020 13:55:45 -0400 Subject: [PATCH 1/3] Only UF and earlier have the CORPSE_ITEM_LOST string Let's not confuse players with missing messages I guess --- zone/exp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zone/exp.cpp b/zone/exp.cpp index 8f722b1f3..b0eb13790 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -718,7 +718,8 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { else Message(Chat::Yellow, "Welcome to level %i!", check_level); - if (check_level == RuleI(Character, DeathItemLossLevel)) + if (check_level == RuleI(Character, DeathItemLossLevel) && + m_ClientVersionBit & EQ::versions::maskUFAndEarlier) MessageString(Chat::Yellow, CORPSE_ITEM_LOST); if (check_level == RuleI(Character, DeathExpLossLevel)) From d507222d21ece298e3394e205dbd12fee4e9e46b Mon Sep 17 00:00:00 2001 From: Noudess Date: Mon, 21 Sep 2020 10:36:00 -0400 Subject: [PATCH 2/3] Allow amphibious creatures to swim to next node of pathing. --- zone/mob_movement_manager.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/zone/mob_movement_manager.cpp b/zone/mob_movement_manager.cpp index 904bc5246..0ebed1188 100644 --- a/zone/mob_movement_manager.cpp +++ b/zone/mob_movement_manager.cpp @@ -1088,6 +1088,17 @@ void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMove PushFlyTo(ent.second, x, y, z, mob_movement_mode); PushStopMoving(ent.second); } + // Below for npcs that can traverse land or water so they don't sink + else if (who->GetFlyMode() == GravityBehavior::Water && + zone->watermap->InLiquid(who->GetPosition()) && + zone->watermap->InLiquid(glm::vec3(x, y, z)) && + zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z))) { + auto iter = _impl->Entries.find(who); + auto &ent = (*iter); + + PushSwimTo(ent.second, x, y, z, mob_movement_mode); + PushStopMoving(ent.second); + } else { UpdatePathGround(who, x, y, z, mob_movement_mode); } From 1d4bea21c18d0f4ad8b5c5de6cb4207bc62115ad Mon Sep 17 00:00:00 2001 From: Snail Date: Sun, 4 Oct 2020 18:17:45 -0400 Subject: [PATCH 3/3] compile fix on linux (glm is using c++14 code), update CXX_STANDARD --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24816a323..0efa7f511 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) -SET(CMAKE_CXX_STANDARD 11) +SET(CMAKE_CXX_STANDARD 14) SET(CMAKE_CXX_STANDARD_REQUIRED ON) SET(CMAKE_CXX_EXTENSIONS OFF)