aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp2
-rw-r--r--src/server/game/Accounts/RBAC.h2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp32
-rw-r--r--src/server/game/Globals/ObjectMgr.h2
-rw-r--r--src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp7
-rw-r--r--src/server/game/Movement/Waypoints/WaypointDefines.h6
-rw-r--r--src/server/game/Movement/Waypoints/WaypointManager.cpp8
-rw-r--r--src/server/game/World/World.cpp1
8 files changed, 4 insertions, 56 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index c12c1b8c1f2..ecc44114f85 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -272,8 +272,6 @@ void EscortAI::AddWaypoint(uint32 id, float x, float y, float z, float orientati
waypoint.orientation = orientation;
waypoint.moveType = run ? WAYPOINT_MOVE_TYPE_RUN : WAYPOINT_MOVE_TYPE_WALK;
waypoint.delay = waitTime.count();
- waypoint.eventId = 0;
- waypoint.eventChance = 100;
_path.nodes.push_back(std::move(waypoint));
}
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index e175025d9bb..c5f46ae0053 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -575,7 +575,7 @@ enum RBACPermissions
RBAC_PERM_COMMAND_RELOAD_SPELL_GROUP_STACK_RULES = 703,
RBAC_PERM_COMMAND_RELOAD_TRINITY_STRING = 704,
// 705 previously used, do not reuse
- RBAC_PERM_COMMAND_RELOAD_WAYPOINT_SCRIPTS = 706,
+ // 706 previously used, do not reuse
RBAC_PERM_COMMAND_RELOAD_WAYPOINT_DATA = 707,
RBAC_PERM_COMMAND_RELOAD_VEHICLE_ACCESORY = 708,
RBAC_PERM_COMMAND_RELOAD_VEHICLE_TEMPLATE_ACCESSORY = 709,
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 2f4573c7ee0..4aa8e3b7304 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -77,7 +77,6 @@
ScriptMapMap sSpellScripts;
ScriptMapMap sEventScripts;
-ScriptMapMap sWaypointScripts;
std::string GetScriptsTableNameByType(ScriptsType type)
{
@@ -86,7 +85,6 @@ std::string GetScriptsTableNameByType(ScriptsType type)
{
case SCRIPTS_SPELL: res = "spell_scripts"; break;
case SCRIPTS_EVENT: res = "event_scripts"; break;
- case SCRIPTS_WAYPOINT: res = "waypoint_scripts"; break;
default: break;
}
return res;
@@ -99,7 +97,6 @@ ScriptMapMap* GetScriptsMapByType(ScriptsType type)
{
case SCRIPTS_SPELL: res = &sSpellScripts; break;
case SCRIPTS_EVENT: res = &sEventScripts; break;
- case SCRIPTS_WAYPOINT: res = &sWaypointScripts; break;
default: break;
}
return res;
@@ -5962,35 +5959,6 @@ void ObjectMgr::LoadEventScripts()
TC_LOG_INFO("server.loading", ">> Loaded {} event scripts in {} ms", _eventScriptStore.size(), GetMSTimeDiffToNow(oldMSTime));
}
-//Load WP Scripts
-void ObjectMgr::LoadWaypointScripts()
-{
- LoadScripts(SCRIPTS_WAYPOINT);
-
- std::set<uint32> actionSet;
-
- for (ScriptMapMap::const_iterator itr = sWaypointScripts.begin(); itr != sWaypointScripts.end(); ++itr)
- actionSet.insert(itr->first);
-
- WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_WAYPOINT_DATA_ACTION);
- PreparedQueryResult result = WorldDatabase.Query(stmt);
-
- if (result)
- {
- do
- {
- Field* fields = result->Fetch();
- uint32 action = fields[0].GetUInt32();
-
- actionSet.erase(action);
- }
- while (result->NextRow());
- }
-
- for (std::set<uint32>::iterator itr = actionSet.begin(); itr != actionSet.end(); ++itr)
- TC_LOG_ERROR("sql.sql", "There is no waypoint which links to the waypoint script {}", *itr);
-}
-
void ObjectMgr::LoadSpellScriptNames()
{
uint32 oldMSTime = getMSTime();
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index a3af1016609..5a86448d870 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -420,7 +420,6 @@ typedef std::multimap<uint32 /*spell id*/, std::pair<uint32 /*script id*/, bool
typedef std::pair<SpellScriptsContainer::iterator, SpellScriptsContainer::iterator> SpellScriptsBounds;
TC_GAME_API extern ScriptMapMap sSpellScripts;
TC_GAME_API extern ScriptMapMap sEventScripts;
-TC_GAME_API extern ScriptMapMap sWaypointScripts;
std::string GetScriptsTableNameByType(ScriptsType type);
ScriptMapMap* GetScriptsMapByType(ScriptsType type);
@@ -1295,7 +1294,6 @@ class TC_GAME_API ObjectMgr
void LoadEventScripts();
void LoadSpellScripts();
- void LoadWaypointScripts();
void LoadSpellScriptNames();
void ValidateSpellScripts();
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 5b67247eff0..fc8ab81069c 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -292,13 +292,6 @@ void WaypointMovementGenerator<Creature>::OnArrived(Creature* owner)
_nextMoveTime.Reset(waitTime);
}
- if (waypoint.eventId && urand(0, 99) < waypoint.eventChance)
- {
- TC_LOG_DEBUG("maps.script", "Creature movement start script {} at point {} for {}.", waypoint.eventId, _currentNode, owner->GetGUID().ToString());
- owner->ClearUnitState(UNIT_STATE_ROAMING_MOVE);
- owner->GetMap()->ScriptsStart(sWaypointScripts, waypoint.eventId, owner, nullptr);
- }
-
// inform AI
if (CreatureAI* AI = owner->AI())
{
diff --git a/src/server/game/Movement/Waypoints/WaypointDefines.h b/src/server/game/Movement/Waypoints/WaypointDefines.h
index 70ab08f2958..119219dd3d4 100644
--- a/src/server/game/Movement/Waypoints/WaypointDefines.h
+++ b/src/server/game/Movement/Waypoints/WaypointDefines.h
@@ -34,7 +34,7 @@ enum WaypointMoveType
struct WaypointNode
{
- WaypointNode() : id(0), x(0.f), y(0.f), z(0.f), delay(0), eventId(0), moveType(WAYPOINT_MOVE_TYPE_RUN), eventChance(0) { }
+ WaypointNode() : id(0), x(0.f), y(0.f), z(0.f), delay(0), moveType(WAYPOINT_MOVE_TYPE_RUN) { }
WaypointNode(uint32 _id, float _x, float _y, float _z, Optional<float> _orientation = { }, uint32 _delay = 0)
{
id = _id;
@@ -43,18 +43,14 @@ struct WaypointNode
z = _z;
orientation = _orientation;
delay = _delay;
- eventId = 0;
moveType = WAYPOINT_MOVE_TYPE_WALK;
- eventChance = 100;
}
uint32 id;
float x, y, z;
Optional<float> orientation;
uint32 delay;
- uint32 eventId;
uint32 moveType;
- uint8 eventChance;
};
struct WaypointPath
diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index 07ccd574ffc..ab018e66233 100644
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -24,8 +24,8 @@ void WaypointMgr::Load()
{
uint32 oldMSTime = getMSTime();
- // 0 1 2 3 4 5 6 7 8 9
- QueryResult result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_type, delay, action, action_chance FROM waypoint_data ORDER BY id, point");
+ // 0 1 2 3 4 5 6 7
+ QueryResult result = WorldDatabase.Query("SELECT id, point, position_x, position_y, position_z, orientation, move_type, delay FROM waypoint_data ORDER BY id, point");
if (!result)
{
@@ -64,8 +64,6 @@ void WaypointMgr::Load()
}
waypoint.delay = fields[7].GetUInt32();
- waypoint.eventId = fields[8].GetUInt32();
- waypoint.eventChance = fields[9].GetInt16();
WaypointPath& path = _waypointStore[pathId];
path.id = pathId;
@@ -123,8 +121,6 @@ void WaypointMgr::ReloadPath(uint32 id)
}
waypoint.delay = fields[6].GetUInt32();
- waypoint.eventId = fields[7].GetUInt32();
- waypoint.eventChance = fields[8].GetUInt8();
values.push_back(std::move(waypoint));
}
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 2a750efef92..ddb921ef3d1 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2339,7 +2339,6 @@ void World::SetInitialWorldSettings()
///- Load and initialize scripts
sObjectMgr->LoadSpellScripts(); // must be after load Creature/Gameobject(Template/Data)
sObjectMgr->LoadEventScripts(); // must be after load Creature/Gameobject(Template/Data)
- sObjectMgr->LoadWaypointScripts();
TC_LOG_INFO("server.loading", "Loading spell script names...");
sObjectMgr->LoadSpellScriptNames();