Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-15 12:04:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/otclient/game.cpp
View File

@@ -133,6 +133,8 @@ void Game::processPendingGame()
void Game::processEnterGame()
{
m_localPlayer->setPendingGame(false);
m_protocolGame->sendEnterGame();
g_lua.callGlobalField("g_game", "onEnterGame");
}
@@ -156,7 +158,7 @@ void Game::processGameStart()
m_protocolGame->sendPing();
disableBotCall();
}
}, 2000);
}, 4000);
}
}

3
src/otclient/protocolcodes.h
View File

@@ -145,7 +145,8 @@ namespace Proto {
enum ClientOpcodes : uint8
{
ClientEnterAccount = 1,
ClientEnterGame = 10,
ClientPendingGame = 10,
ClientEnterGame = 15,
ClientLeaveGame = 20,
ClientPing = 29,
ClientPingBack = 30,

1
src/otclient/protocolgame.h
View File

@@ -36,6 +36,7 @@ public:
void sendExtendedOpcode(uint8 opcode, const std::string& buffer);
void sendLoginPacket(uint challangeTimestamp, uint8 challangeRandom);
void sendEnterGame();
void sendLogout();
void sendPing();
void sendPingBack();

13
src/otclient/protocolgameparse.cpp
View File

@@ -43,9 +43,11 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
opcode = msg->getU8();
// must be > so extended will be enabled before GameStart.
if(!m_gameInitialized && opcode > Proto::GameServerFirstGameOpcode) {
g_game.processGameStart();
m_gameInitialized = true;
if(!g_game.getFeature(Otc::GameLoginPending)) {
if(!m_gameInitialized && opcode > Proto::GameServerFirstGameOpcode) {
g_game.processGameStart();
m_gameInitialized = true;
}
}
// try to parse in lua first
@@ -361,6 +363,11 @@ void ProtocolGame::parseEnterGame(const InputMessagePtr& msg)
{
//set player to entered game state
g_game.processEnterGame();
if(!m_gameInitialized) {
g_game.processGameStart();
m_gameInitialized = true;
}
}
void ProtocolGame::parseGMActions(const InputMessagePtr& msg)

11
src/otclient/protocolgamesend.cpp
View File

@@ -48,7 +48,7 @@ void ProtocolGame::sendLoginPacket(uint challangeTimestamp, uint8 challangeRando
{
OutputMessagePtr msg(new OutputMessage);
msg->addU8(Proto::ClientEnterGame);
msg->addU8(Proto::ClientPendingGame);
msg->addU16(g_lua.callGlobalField<int>("g_game", "getOsType"));
msg->addU16(g_game.getProtocolVersion());
@@ -103,6 +103,13 @@ void ProtocolGame::sendLoginPacket(uint challangeTimestamp, uint8 challangeRando
enableXteaEncryption();
}
void ProtocolGame::sendEnterGame()
{
OutputMessagePtr msg(new OutputMessage);
msg->addU8(Proto::ClientEnterGame);
send(msg);
}
void ProtocolGame::sendLogout()
{
OutputMessagePtr msg(new OutputMessage);
@@ -444,7 +451,7 @@ void ProtocolGame::sendLook(const Position& position, int thingId, int stackpos)
void ProtocolGame::sendLookCreature(uint32 creatureId)
{
OutputMessagePtr msg(new OutputMessage);
msg->addU8(0x8D);
msg->addU8(Proto::ClientLookCreature);
msg->addU32(creatureId);
send(msg);
}