diff --git a/sql/updates/world/4.3.4/2020_08_28_03_world.sql b/sql/updates/world/4.3.4/2020_08_28_03_world.sql new file mode 100644 index 0000000000..857cba2ee1 --- /dev/null +++ b/sql/updates/world/4.3.4/2020_08_28_03_world.sql @@ -0,0 +1,11 @@ +ALTER TABLE `creature_formations` + CHANGE `leaderGUID` `LeaderGUID` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `memberGUID` `MemberGUID` INT(10) UNSIGNED DEFAULT 0 NOT NULL, + CHANGE `dist` `FollowDistance` FLOAT UNSIGNED NOT NULL, + CHANGE `angle` `FollowAngle` FLOAT UNSIGNED NOT NULL, + CHANGE `groupAI` `GroupAI` INT(10) UNSIGNED NOT NULL, + CHANGE `point_1` `InversionPoint1` INT(5) DEFAULT -1 NULL, + CHANGE `point_2` `InversionPoint2` INT(5) DEFAULT -1 NULL; + +UPDATE `creature_formations` SET `InversionPoint1` = -1 WHERE `InversionPoint1`= 0; +UPDATE `creature_formations` SET `InversionPoint2` = -1 WHERE `InversionPoint2`= 0; diff --git a/src/server/database/Database/Implementation/WorldDatabase.cpp b/src/server/database/Database/Implementation/WorldDatabase.cpp index 84ac919955..650441227b 100644 --- a/src/server/database/Database/Implementation/WorldDatabase.cpp +++ b/src/server/database/Database/Implementation/WorldDatabase.cpp @@ -43,7 +43,7 @@ void WorldDatabaseConnection::DoPrepareStatements() PrepareStatement(WORLD_UPD_CREATURE_POSITION, "UPDATE creature SET position_x = ?, position_y = ?, position_z = ?, orientation = ? WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(WORLD_UPD_CREATURE_SPAWN_DISTANCE, "UPDATE creature SET spawndist = ?, MovementType = ? WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(WORLD_UPD_CREATURE_SPAWN_TIME_SECS, "UPDATE creature SET spawntimesecs = ? WHERE guid = ?", CONNECTION_ASYNC); - PrepareStatement(WORLD_INS_CREATURE_FORMATION, "INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES (?, ?, ?, ?, ?)", CONNECTION_ASYNC); + PrepareStatement(WORLD_INS_CREATURE_FORMATION, "INSERT INTO creature_formations (LeaderGUID, MemberGUID, FollowDistance, FollowAngle, GroupAI) VALUES (?, ?, ?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(WORLD_INS_WAYPOINT_DATA, "INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES (?, ?, ?, ?, ?)", CONNECTION_ASYNC); PrepareStatement(WORLD_DEL_WAYPOINT_DATA, "DELETE FROM waypoint_data WHERE id = ? AND point = ?", CONNECTION_ASYNC); PrepareStatement(WORLD_UPD_WAYPOINT_DATA_POINT, "UPDATE waypoint_data SET point = point - 1 WHERE id = ? AND point > ?", CONNECTION_ASYNC); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index e1196a47ee..b630b12f11 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -363,7 +363,7 @@ void Creature::SearchFormation() CreatureGroupInfoType::iterator frmdata = sFormationMgr->CreatureGroupMap.find(lowguid); if (frmdata != sFormationMgr->CreatureGroupMap.end()) - sFormationMgr->AddCreatureToGroup(frmdata->second->leaderGUID, this); + sFormationMgr->AddCreatureToGroup(frmdata->second.LeaderGUID, this); } bool Creature::IsFormationLeader() const diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index c4567ffbb3..242ef8eb04 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -29,12 +29,6 @@ #define MAX_DESYNC 5.0f -FormationMgr::~FormationMgr() -{ - for (CreatureGroupInfoType::iterator itr = CreatureGroupMap.begin(); itr != CreatureGroupMap.end(); ++itr) - delete itr->second; -} - FormationMgr* FormationMgr::instance() { static FormationMgr instance; @@ -86,12 +80,10 @@ void FormationMgr::LoadCreatureFormations() { uint32 oldMSTime = getMSTime(); - for (CreatureGroupInfoType::iterator itr = CreatureGroupMap.begin(); itr != CreatureGroupMap.end(); ++itr) // for reload case - delete itr->second; CreatureGroupMap.clear(); //Get group data - QueryResult result = WorldDatabase.Query("SELECT leaderGUID, memberGUID, dist, angle, groupAI, point_1, point_2 FROM creature_formations ORDER BY leaderGUID"); + QueryResult result = WorldDatabase.Query("SELECT LeaderGUID, MemberGUID, FollowDistance, FollowAngle, GroupAI, InversionPoint1, InversionPoint2 FROM creature_formations ORDER BY LeaderGUID"); if (!result) { @@ -101,44 +93,41 @@ void FormationMgr::LoadCreatureFormations() uint32 count = 0; Field* fields; - FormationInfo* group_member; + FormationInfo group_member; do { fields = result->Fetch(); - //Load group member data - group_member = new FormationInfo(); - group_member->leaderGUID = fields[0].GetUInt32(); - uint32 memberGUID = fields[1].GetUInt32(); - group_member->groupAI = fields[4].GetUInt32(); - group_member->point_1 = fields[5].GetUInt16(); - group_member->point_2 = fields[6].GetUInt16(); - //If creature is group leader we may skip loading of dist/angle - if (group_member->leaderGUID != memberGUID) + // Load group member data + group_member.LeaderGUID = fields[0].GetUInt32(); + uint32 memberGUID = fields[1].GetUInt32(); + group_member.GroupAI = fields[4].GetUInt32(); + group_member.InversionPoint1 = fields[5].GetInt32(); + group_member.InversionPoint2 = fields[6].GetInt32(); + // If creature is group leader we may skip loading of dist/angle + if (group_member.LeaderGUID != memberGUID) { - group_member->follow_dist = fields[2].GetFloat(); - group_member->follow_angle = fields[3].GetFloat() * float(M_PI) / 180; + group_member.FollowDistance = fields[2].GetFloat(); + group_member.FollowAngle = fields[3].GetFloat() * float(M_PI) / 180; } else { - group_member->follow_dist = 0; - group_member->follow_angle = 0; + group_member.FollowDistance = 0; + group_member.FollowAngle = 0; } // check data correctness { - if (!sObjectMgr->GetCreatureData(group_member->leaderGUID)) + if (!sObjectMgr->GetCreatureData(group_member.LeaderGUID)) { - TC_LOG_ERROR("sql.sql", "creature_formations table leader guid %u incorrect (not exist)", group_member->leaderGUID); - delete group_member; + TC_LOG_ERROR("sql.sql", "creature_formations table leader guid %u incorrect (not exist)", group_member.LeaderGUID); continue; } if (!sObjectMgr->GetCreatureData(memberGUID)) { TC_LOG_ERROR("sql.sql", "creature_formations table member guid %u incorrect (not exist)", memberGUID); - delete group_member; continue; } } @@ -177,7 +166,7 @@ void CreatureGroup::RemoveMember(Creature* member) void CreatureGroup::MemberEngagingTarget(Creature* member, Unit* target) { - uint8 groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()]->groupAI; + uint8 groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()].GroupAI; if (!groupAI) return; @@ -229,15 +218,15 @@ void CreatureGroup::LeaderStartedMoving() for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) { Creature* member = itr->first; - if (member == m_leader || !member->IsAlive() || member->GetVictim() || !(itr->second->groupAI & FLAG_IDLE_IN_FORMATION)) + if (member == m_leader || !member->IsAlive() || member->GetVictim() || !(itr->second.GroupAI & FLAG_IDLE_IN_FORMATION)) continue; - float angle = itr->second->follow_angle + float(M_PI); - float dist = itr->second->follow_dist; + float angle = itr->second.FollowAngle + float(M_PI); + float dist = itr->second.FollowDistance; MovementGenerator const* moveGen = member->GetMotionMaster()->GetMotionSlot(MOTION_SLOT_IDLE); if (!moveGen || moveGen->GetMovementGeneratorType() != FORMATION_MOTION_TYPE) - member->GetMotionMaster()->MoveFormation(m_leader, dist, angle, itr->second->point_1, itr->second->point_2); + member->GetMotionMaster()->MoveFormation(m_leader, dist, angle, itr->second.InversionPoint1, itr->second.InversionPoint2); } } diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index 0b25ac3953..7977fa57c9 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -38,21 +38,21 @@ class Unit; struct FormationInfo { - uint32 leaderGUID; - float follow_dist; - float follow_angle; - uint32 groupAI; - uint32 point_1; - uint32 point_2; + uint32 LeaderGUID; + float FollowDistance = 0.f; + float FollowAngle = 0.f; + uint32 GroupAI = 0; + int32 InversionPoint1 = 0; + int32 InversionPoint2 = 0; }; -typedef std::unordered_map CreatureGroupInfoType; +typedef std::unordered_map CreatureGroupInfoType; class TC_GAME_API FormationMgr { private: FormationMgr() { } - ~FormationMgr(); + ~FormationMgr() { } public: static FormationMgr* instance(); @@ -69,7 +69,7 @@ class TC_GAME_API CreatureGroup { private: Creature* m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D - typedef std::map CreatureGroupMemberType; + typedef std::map CreatureGroupMemberType; CreatureGroupMemberType m_members; uint32 m_groupID; diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index e4e741844f..dcac2521b2 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -716,7 +716,7 @@ void MotionMaster::MoveRotate(uint32 time, RotateDirection direction) Mutate(new RotateMovementGenerator(time, direction), MOTION_SLOT_ACTIVE); } -void MotionMaster::MoveFormation(Unit* leader, float range, float angle, uint32 point1, uint32 point2) +void MotionMaster::MoveFormation(Unit* leader, float range, float angle, int32 point1, int32 point2) { if (_owner->GetTypeId() == TYPEID_UNIT && leader) { diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index e878a119f0..de4b08b15d 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -197,7 +197,7 @@ class TC_GAME_API MotionMaster void MovePath(WaypointPath& path, bool repeatable); void MoveRotate(uint32 time, RotateDirection direction); - void MoveFormation(Unit* leader, float range, float angle, uint32 point1, uint32 point2); + void MoveFormation(Unit* leader, float range, float angle, int32 point1, int32 point2); void LaunchMoveSpline(Movement::MoveSplineInit&& init, uint32 id = 0, MovementSlot slot = MOTION_SLOT_ACTIVE, MovementGeneratorType type = EFFECT_MOTION_TYPE); private: diff --git a/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.cpp index 9db9993a67..465e66f9b5 100644 --- a/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.cpp @@ -23,7 +23,7 @@ #include "MoveSplineInit.h" #include "MoveSpline.h" -FormationMovementGenerator::FormationMovementGenerator(Unit* leader, float range, float angle, uint32 point1, uint32 point2) : +FormationMovementGenerator::FormationMovementGenerator(Unit* leader, float range, float angle, int32 point1, int32 point2) : AbstractPursuer(PursuingType::Formation, leader), _range(range), _angle(angle), _point1(point1), _point2(point2), _lastLeaderSplineID(0), _hasPredictedDestination(false) { } void FormationMovementGenerator::DoInitialize(Creature* owner) @@ -66,7 +66,7 @@ bool FormationMovementGenerator::DoUpdate(Creature* owner, uint32 diff) if (!target->movespline->Finalized() && target->movespline->GetId() != _lastLeaderSplineID) { // Update formation angle - if (_point1 && target->IsCreature()) + if ((_point1 >= 0 || _point2 >= 0) && target->IsCreature()) { if (CreatureGroup* formation = target->ToCreature()->GetFormation()) { @@ -97,7 +97,7 @@ bool FormationMovementGenerator::DoUpdate(Creature* owner, uint32 diff) } } - // We have reached our destination before launching a new movement. Alling facing with leader + // We have reached our destination before launching a new movement. Allign facing with leader if (owner->HasUnitState(UNIT_STATE_ROAMING_MOVE) && owner->movespline->Finalized()) { owner->ClearUnitState(UNIT_STATE_ROAMING_MOVE); diff --git a/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h index f022bb63cc..86e086a188 100644 --- a/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FormationMovementGenerator.h @@ -27,7 +27,7 @@ class Creature; class FormationMovementGenerator : public MovementGeneratorMedium, public AbstractPursuer { public: - explicit FormationMovementGenerator(Unit* leader, float range, float angle, uint32 point1, uint32 point2); + explicit FormationMovementGenerator(Unit* leader, float range, float angle, int32 point1, int32 point2); MovementGeneratorType GetMovementGeneratorType() const override { return FORMATION_MOTION_TYPE; } @@ -44,8 +44,8 @@ class FormationMovementGenerator : public MovementGeneratorMediumGetSession()->GetPlayer(); - FormationInfo* group_member; + FormationInfo group_member; - group_member = new FormationInfo; - group_member->follow_angle = (creature->GetAngle(chr) - chr->GetOrientation()) * 180 / float(M_PI); - group_member->follow_dist = std::sqrt(std::pow(chr->GetPositionX() - creature->GetPositionX(), 2.f) + std::pow(chr->GetPositionY() - creature->GetPositionY(), 2.f)); - group_member->leaderGUID = leaderGUID; - group_member->groupAI = 0; + group_member.FollowAngle = (creature->GetAngle(chr) - chr->GetOrientation()) * 180 / float(M_PI); + group_member.FollowDistance = std::sqrt(std::pow(chr->GetPositionX() - creature->GetPositionX(), 2.f) + std::pow(chr->GetPositionY() - creature->GetPositionY(), 2.f)); + group_member.LeaderGUID = leaderGUID; + group_member.GroupAI = 0; sFormationMgr->CreatureGroupMap[lowguid] = group_member; creature->SearchFormation(); @@ -1712,9 +1711,9 @@ public: stmt->setUInt32(0, leaderGUID); stmt->setUInt32(1, lowguid); - stmt->setFloat(2, group_member->follow_dist); - stmt->setFloat(3, group_member->follow_angle); - stmt->setUInt32(4, uint32(group_member->groupAI)); + stmt->setFloat(2, group_member.FollowAngle); + stmt->setFloat(3, group_member.FollowDistance); + stmt->setUInt32(4, uint32(group_member.GroupAI)); WorldDatabase.Execute(stmt);