gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix 7.60 login protocol

This commit is contained in:
Sam 2013-12-23 23:42:58 +01:00
parent 6a4868f2b5
commit 9d8cf33acc
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gamelib/protocol.lua
View File

@ -188,9 +188,5 @@ ClientOpcodes = {
ClientMarketCreate = 246, -- 944 ClientMarketCreate = 246, -- 944
ClientMarketCancel = 247, -- 944 ClientMarketCancel = 247, -- 944
ClientMarketAccept = 248, -- 944 ClientMarketAccept = 248, -- 944
ClientAnswerModalDialog = 249, -- 960 ClientAnswerModalDialog = 249 -- 960
-- 760
ClientEnterAccount760 = 513,
ClientEnterGame760 = 522
} }

7
modules/gamelib/protocollogin.lua
View File

@ -27,12 +27,8 @@ end
function ProtocolLogin:sendLoginPacket() function ProtocolLogin:sendLoginPacket()
local msg = OutputMessage.create() local msg = OutputMessage.create()
if g_game.getProtocolVersion() == 760 then
msg:addU16(ClientOpcodes.ClientEnterAccount760)
else
msg:addU8(ClientOpcodes.ClientEnterAccount) msg:addU8(ClientOpcodes.ClientEnterAccount)
msg:addU16(g_game.getOs()) msg:addU16(g_game.getOs())
end
msg:addU16(g_game.getProtocolVersion()) msg:addU16(g_game.getProtocolVersion())
@ -50,10 +46,9 @@ function ProtocolLogin:sendLoginPacket()
local offset = msg:getMessageSize() local offset = msg:getMessageSize()
if g_game.getProtocolVersion() >= 800 then
-- first RSA byte must be 0 -- first RSA byte must be 0
msg:addU8(0) msg:addU8(0)
if g_game.getProtocolVersion() >= 800 then
-- xtea key -- xtea key
self:generateXteaKey() self:generateXteaKey()
local xteaKey = self:getXteaKey() local xteaKey = self:getXteaKey()

8
src/client/protocolgamesend.cpp
View File

@ -52,16 +52,8 @@ void ProtocolGame::sendLoginPacket(uint challengeTimestamp, uint8 challengeRando
{ {
OutputMessagePtr msg(new OutputMessage); OutputMessagePtr msg(new OutputMessage);
if(g_game.getProtocolVersion() == 760)
{
msg->addU16(0x20A);
msg->addU8(g_game.getOs());
}
else
{
msg->addU8(Proto::ClientPendingGame); msg->addU8(Proto::ClientPendingGame);
msg->addU16(g_game.getOs()); msg->addU16(g_game.getOs());
}
msg->addU16(g_game.getProtocolVersion()); msg->addU16(g_game.getProtocolVersion());
if(g_game.getProtocolVersion() >= 971) { if(g_game.getProtocolVersion() >= 971) {