diff options
| author | Subv <subv2112@gmail.com> | 2014-07-05 21:38:29 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-07-05 21:38:29 -0500 |
| commit | b5d5768d44d04ac8ecc066f13161b09c1cd5cf06 (patch) | |
| tree | 468eed15b73cdd6b56a16f4783da715f23baa799 /src/server/game/Scripting | |
| parent | 42b2041aebd9081626e4531d655a35cd924b7e35 (diff) | |
Fixed the crashes
Diffstat (limited to 'src/server/game/Scripting')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 06f6094c511..b45ed6b640c 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -400,35 +400,35 @@ void ScriptMgr::OnNetworkStop() FOREACH_SCRIPT(ServerScript)->OnNetworkStop(); } -void ScriptMgr::OnSocketOpen(WorldTcpSession* socket) +void ScriptMgr::OnSocketOpen(std::shared_ptr<WorldTcpSession> socket) { ASSERT(socket); FOREACH_SCRIPT(ServerScript)->OnSocketOpen(socket); } -void ScriptMgr::OnSocketClose(WorldTcpSession* socket, bool wasNew) +void ScriptMgr::OnSocketClose(std::shared_ptr<WorldTcpSession> socket, bool wasNew) { ASSERT(socket); FOREACH_SCRIPT(ServerScript)->OnSocketClose(socket, wasNew); } -void ScriptMgr::OnPacketReceive(WorldTcpSession* socket, WorldPacket packet) +void ScriptMgr::OnPacketReceive(std::shared_ptr<WorldTcpSession> socket, WorldPacket packet) { ASSERT(socket); FOREACH_SCRIPT(ServerScript)->OnPacketReceive(socket, packet); } -void ScriptMgr::OnPacketSend(WorldTcpSession* socket, WorldPacket packet) +void ScriptMgr::OnPacketSend(std::shared_ptr<WorldTcpSession> socket, WorldPacket packet) { ASSERT(socket); FOREACH_SCRIPT(ServerScript)->OnPacketSend(socket, packet); } -void ScriptMgr::OnUnknownPacketReceive(WorldTcpSession* socket, WorldPacket packet) +void ScriptMgr::OnUnknownPacketReceive(std::shared_ptr<WorldTcpSession> socket, WorldPacket packet) { ASSERT(socket); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 530d99b9ad2..81c764cb1ca 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -221,23 +221,23 @@ class ServerScript : public ScriptObject virtual void OnNetworkStop() { } // Called when a remote socket establishes a connection to the server. Do not store the socket object. - virtual void OnSocketOpen(WorldTcpSession* /*socket*/) { } + virtual void OnSocketOpen(std::shared_ptr<WorldTcpSession> /*socket*/) { } // Called when a socket is closed. Do not store the socket object, and do not rely on the connection // being open; it is not. - virtual void OnSocketClose(WorldTcpSession* /*socket*/, bool /*wasNew*/) { } + virtual void OnSocketClose(std::shared_ptr<WorldTcpSession> /*socket*/, bool /*wasNew*/) { } // Called when a packet is sent to a client. The packet object is a copy of the original packet, so reading // and modifying it is safe. - virtual void OnPacketSend(WorldTcpSession* /*socket*/, WorldPacket& /*packet*/) { } + virtual void OnPacketSend(std::shared_ptr<WorldTcpSession> /*socket*/, WorldPacket& /*packet*/) { } // Called when a (valid) packet is received by a client. The packet object is a copy of the original packet, so // reading and modifying it is safe. - virtual void OnPacketReceive(WorldTcpSession* /*socket*/, WorldPacket& /*packet*/) { } + virtual void OnPacketReceive(std::shared_ptr<WorldTcpSession> /*socket*/, WorldPacket& /*packet*/) { } // Called when an invalid (unknown opcode) packet is received by a client. The packet is a reference to the orignal // packet; not a copy. This allows you to actually handle unknown packets (for whatever purpose). - virtual void OnUnknownPacketReceive(WorldTcpSession* /*socket*/, WorldPacket& /*packet*/) { } + virtual void OnUnknownPacketReceive(std::shared_ptr<WorldTcpSession> /*socket*/, WorldPacket& /*packet*/) { } }; class WorldScript : public ScriptObject @@ -908,11 +908,11 @@ class ScriptMgr void OnNetworkStart(); void OnNetworkStop(); - void OnSocketOpen(WorldTcpSession* socket); - void OnSocketClose(WorldTcpSession* socket, bool wasNew); - void OnPacketReceive(WorldTcpSession* socket, WorldPacket packet); - void OnPacketSend(WorldTcpSession* socket, WorldPacket packet); - void OnUnknownPacketReceive(WorldTcpSession* socket, WorldPacket packet); + void OnSocketOpen(std::shared_ptr<WorldTcpSession> socket); + void OnSocketClose(std::shared_ptr<WorldTcpSession> socket, bool wasNew); + void OnPacketReceive(std::shared_ptr<WorldTcpSession> socket, WorldPacket packet); + void OnPacketSend(std::shared_ptr<WorldTcpSession> socket, WorldPacket packet); + void OnUnknownPacketReceive(std::shared_ptr<WorldTcpSession> socket, WorldPacket packet); public: /* WorldScript */ |
