Fix 7.60 login protocol

edubart · Dec 23, 2013 · 9d8cf33 · 9d8cf33
1 parent 6a4868f
commit 9d8cf33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/modules/gamelib/protocol.lua b/modules/gamelib/protocol.lua
@@ -188,9 +188,5 @@ ClientOpcodes = {
     ClientMarketCreate                  = 246, -- 944
     ClientMarketCancel                  = 247, -- 944
     ClientMarketAccept                  = 248, -- 944
-    ClientAnswerModalDialog             = 249, -- 960
-
-    -- 760
-    ClientEnterAccount760               = 513,
-    ClientEnterGame760                  = 522
+    ClientAnswerModalDialog             = 249  -- 960
 }
diff --git a/modules/gamelib/protocollogin.lua b/modules/gamelib/protocollogin.lua
@@ -27,13 +27,9 @@ end
 
 function ProtocolLogin:sendLoginPacket()
   local msg = OutputMessage.create()
-  if g_game.getProtocolVersion() == 760 then
-    msg:addU16(ClientOpcodes.ClientEnterAccount760)
-  else
-    msg:addU8(ClientOpcodes.ClientEnterAccount)
-    msg:addU16(g_game.getOs())
-  end
-
+  msg:addU8(ClientOpcodes.ClientEnterAccount)
+  msg:addU16(g_game.getOs())
+
   msg:addU16(g_game.getProtocolVersion())
 
   if g_game.getProtocolVersion() >= 971 then
@@ -50,10 +46,9 @@ function ProtocolLogin:sendLoginPacket()
 
   local offset = msg:getMessageSize()
 
-   -- first RSA byte must be 0
-  msg:addU8(0)
-
   if g_game.getProtocolVersion() >= 800 then
+    -- first RSA byte must be 0
+    msg:addU8(0)
     -- xtea key
     self:generateXteaKey()
     local xteaKey = self:getXteaKey()

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