More progress on cipserver login for pv973 and a few fixes.

* Fixed the "options" module hotkey (changed boost walker to Ctrl+Shift+D).
* Fixed a small issue with UIMiniWindow:setup() function (was setting parent before its pos).
* Pic signature has changed for cipsoft client.
* Fixed 'client type' byte position in the login packet.
* Changed the ping function to execute every 4 seconds rather than 2.
* Changed some protocolgame for pv973 support.
This commit is contained in:
BeniS
2013-01-04 11:42:02 +13:00
parent c47641d7e1
commit ca46b5033e
10 changed files with 37 additions and 11 deletions

View File

@@ -90,8 +90,9 @@ function Options.init()
end
end
g_keyboard.bindKeyDown('Ctrl+D', function() Options.toggle() end)
g_keyboard.bindKeyDown('Ctrl+F', function() Options.toggleOption('fullscreen') end)
g_keyboard.bindKeyDown('Ctrl+D', function() Options.toggleOption('walkBooster') end)
g_keyboard.bindKeyDown('Ctrl+Shift+D', function() Options.toggleOption('walkBooster') end)
optionsWindow = g_ui.displayUI('options.otui')
optionsWindow:hide()

View File

@@ -95,8 +95,8 @@ function UIMiniWindow:setup()
self.miniIndex = selfSettings.index
parent:scheduleInsert(self, selfSettings.index)
elseif selfSettings.position then
self:setParent(parent)
self:setPosition(topoint(selfSettings.position))
self:setParent(parent)
addEvent(function() self:bindRectToParent() end)
end
end

View File

@@ -149,6 +149,9 @@ CIPSOFT_RSA = "1321277432058722840622950990822933849527763264961655079678763618"
-- set to the latest Tibia.pic signature to make otclient compatible with official tibia
PIC_SIGNATURE = 1337606793
if g_game.getClientVersion() < 970 then
PIC_SIGNATURE = 1353074333
end
OsTypes = {
Linux = 1,
@@ -162,7 +165,7 @@ OsTypes = {
PathFindResults = {
Ok = 0,
Position = 1,
Impossipble = 2,
Impossible = 2,
TooFar = 3,
NoWay = 4
}

View File

@@ -32,13 +32,16 @@ function ProtocolLogin:sendLoginPacket()
if g_game.getProtocolVersion() >= 971 then
msg:addU32(g_game.getClientVersion())
msg:addU8(182) -- clientType
end
msg:addU32(g_things.getDatSignature())
msg:addU32(g_sprites.getSprSignature())
msg:addU32(PIC_SIGNATURE)
if g_game.getProtocolVersion() >= 971 then
msg:addU8(0) -- clientType
end
local paddingBytes = 128
msg:addU8(0) -- first RSA byte must be 0
paddingBytes = paddingBytes - 1