Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Some fixes and cleanups.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-08-07 17:58:45 +02:00
parent aff24e3598
commit 9794e99d8a
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Scripting/ScriptMgr.cpp
View File

@@ -168,6 +168,7 @@ ScriptMgr::~ScriptMgr()
SCR_CLEAR(VehicleScript);
SCR_CLEAR(DynamicObjectScript);
SCR_CLEAR(TransportScript);
SCR_CLEAR(AchievementCriteriaScript);
#undef SCR_CLEAR
}
@@ -355,21 +356,21 @@ void ScriptMgr::OnSocketClose(WorldSocket* socket, bool wasNew)
FOREACH_SCRIPT(ServerScript)->OnSocketClose(socket, wasNew);
}
void ScriptMgr::OnPacketReceive(WorldSocket* socket, WorldPacket& packet)
void ScriptMgr::OnPacketReceive(WorldSocket* socket, WorldPacket packet)
{
ASSERT(socket);
FOREACH_SCRIPT(ServerScript)->OnPacketReceive(socket, packet);
}
void ScriptMgr::OnPacketSend(WorldSocket* socket, WorldPacket& packet)
void ScriptMgr::OnPacketSend(WorldSocket* socket, WorldPacket packet)
{
ASSERT(socket);
FOREACH_SCRIPT(ServerScript)->OnPacketSend(socket, packet);
}
void ScriptMgr::OnUnknownPacketReceive(WorldSocket* socket, WorldPacket& packet)
void ScriptMgr::OnUnknownPacketReceive(WorldSocket* socket, WorldPacket packet)
{
ASSERT(socket);
@@ -503,6 +504,7 @@ void ScriptMgr::OnDestroyMap(Map* map)
void ScriptMgr::OnLoadGridMap(Map* map, GridMap* gmap, uint32 gx, uint32 gy)
{
ASSERT(map);
ASSERT(gmap);
SCR_MAP_BGN(WorldMapScript, map, itr, end, entry, IsContinent);
itr->second->OnLoadGridMap(map, gmap, gx, gy);
@@ -520,6 +522,7 @@ void ScriptMgr::OnLoadGridMap(Map* map, GridMap* gmap, uint32 gx, uint32 gy)
void ScriptMgr::OnUnloadGridMap(Map* map, GridMap* gmap, uint32 gx, uint32 gy)
{
ASSERT(map);
ASSERT(gmap);
SCR_MAP_BGN(WorldMapScript, map, itr, end, entry, IsContinent);
itr->second->OnUnloadGridMap(map, gmap, gx, gy);
@@ -923,6 +926,7 @@ bool ScriptMgr::OnConditionCheck(Condition* condition, Player* player, Unit* tar
{
ASSERT(condition);
ASSERT(player);
// targetOverride can be NULL.
GET_SCRIPT_RET(ConditionScript, condition->mScriptId, tmpscript, true);
return tmpscript->OnConditionCheck(condition, player, targetOverride);
@@ -1056,7 +1060,7 @@ void ScriptMgr::OnShutdown()
bool ScriptMgr::OnCriteriaCheck(AchievementCriteriaData const* data, Player* source, Unit* target)
{
ASSERT(source);
// target can be NULL
// target can be NULL.
GET_SCRIPT_RET(AchievementCriteriaScript, data->ScriptId, tmpscript, false);
return tmpscript->OnCheck(source, target);

9
src/server/game/Scripting/ScriptMgr.h
View File

@@ -35,6 +35,7 @@
#include "ConditionMgr.h"
#include "Vehicle.h"
#include "Transport.h"
#include "AchievementMgr.h"
class Player;
class Creature;
@@ -768,7 +769,7 @@ class AchievementCriteriaScript : public ScriptObject
bool IsDatabaseBound() const { return true; }
// Called when additional criteria is checked
// Called when an additional criteria is checked.
virtual bool OnCheck(Player* source, Unit* target) = 0;
};
@@ -813,9 +814,9 @@ class ScriptMgr
void OnNetworkStop();
void OnSocketOpen(WorldSocket* socket);
void OnSocketClose(WorldSocket* socket, bool wasNew);
void OnPacketReceive(WorldSocket* socket, WorldPacket& packet);
void OnPacketSend(WorldSocket* socket, WorldPacket& packet);
void OnUnknownPacketReceive(WorldSocket* socket, WorldPacket& packet);
void OnPacketReceive(WorldSocket* socket, WorldPacket packet);
void OnPacketSend(WorldSocket* socket, WorldPacket packet);
void OnUnknownPacketReceive(WorldSocket* socket, WorldPacket packet);
public: /* WorldScript */