Digitalstack/otclientv8
2
0
Fork 0
mirror of https://github.com/OTCv8/otclientv8.git synced 2025-10-21 15:13:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.5.1 - http://otclient.net/showthread.php?tid=249

Browse Source
This commit is contained in:
OTCv8
2020-07-15 18:25:22 +02:00
parent f17ac1ec71
commit f6f88a9cb3
16 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/effect.cpp
View File

@@ -32,7 +32,7 @@ void Effect::draw(const Point& dest, int offsetX, int offsetY, bool animate, Lig
return;
if(animate) {
if(g_game.getFeature(Otc::GameEnhancedAnimations)) {
if(g_game.getFeature(Otc::GameEnhancedAnimations) && rawGetThingType()->getAnimator()) {
// This requires a separate getPhaseAt method as using getPhase would make all magic effects use the same phase regardless of their appearance time
m_animationPhase = rawGetThingType()->getAnimator()->getPhaseAt(m_animationTimer, m_animationPhase);
} else {
@@ -46,11 +46,11 @@ void Effect::draw(const Point& dest, int offsetX, int offsetY, bool animate, Lig
}
}
int xPattern = offsetX % getNumPatternX();
int xPattern = m_position.x % getNumPatternX();
if(xPattern < 0)
xPattern += getNumPatternX();
int yPattern = offsetY % getNumPatternY();
int yPattern = m_position.y % getNumPatternY();
if(yPattern < 0)
yPattern += getNumPatternY();

19
src/client/protocolgameparse.cpp
View File

@@ -420,7 +420,7 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
case Proto::GameServerNews:
parseGameNews(msg);
break;
case Proto::GameServerSendBlessDialog:
case Proto::GameServerBlessDialog:
parseBlessDialog(msg);
break;
case Proto::GameServerMessageDialog:
@@ -468,7 +468,7 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
case Proto::GameServerImbuementWindow:
parseImbuementWindow(msg);
break;
case Proto::GaneServerCloseImbuementWindow:
case Proto::GameServerCloseImbuementWindow:
parseCloseImbuementWindow(msg);
break;
case Proto::GameServerCyclopediaNewDetails:
@@ -633,8 +633,9 @@ void ProtocolGame::parseRestingAreaState(const InputMessagePtr& msg)
void ProtocolGame::parseBlessings(const InputMessagePtr& msg)
{
uint16 blessings = msg->getU16();
if (g_game.getFeature(Otc::GameTibia12Protocol))
if (g_game.getFeature(Otc::GameTibia12Protocol)) {
msg->getU8(); // blessStatus - 1 = Disabled | 2 = normal | 3 = green
}
m_localPlayer->setBlessings(blessings);
}
@@ -716,7 +717,7 @@ void ProtocolGame::parseCompleteStorePurchase(const InputMessagePtr& msg)
std::string message = msg->getString();
g_lua.callGlobalField("g_game", "onStorePurchase", message);
if (g_game.getFeature(Otc::GameTibia12Protocol) && g_game.getProtocolVersion() < 1220) {
if (g_game.getProtocolVersion() < 1220) {
int coins = msg->getU32();
int transferableCoins = msg->getU32();
g_lua.callGlobalField("g_game", "onCoinBalance", coins, transferableCoins);
@@ -813,7 +814,8 @@ void ProtocolGame::parseStoreOffers(const InputMessagePtr& msg)
msg->getU16();
}
if (g_game.getProtocolVersion() >= 1212)
msg->getU8();
msg->getU8(); // has category?
msg->getString(); // filter
msg->getU32(); // TimeAddedToStore
msg->getU16(); // TimesBought
@@ -2590,6 +2592,9 @@ void ProtocolGame::parseBlessDialog(const InputMessagePtr& msg)
for (int i = 0; i < totalBless; i++) {
msg->getU16(); // bless bit wise
msg->getU8(); // player bless count
if (g_game.getClientVersion() >= 1220) {
msg->getU8(); // store?
}
}
// parse general info
@@ -3102,7 +3107,7 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type)
creatureType = Proto::CreatureTypeNpc;
}
if (creatureType == Proto::CreatureTypeSummonOwn)
if (g_game.getFeature(Otc::GameTibia12Protocol) && creatureType == Proto::CreatureTypeSummonOwn)
msg->getU32(); // master
std::string name = g_game.formatCreatureName(msg->getString());
@@ -3159,6 +3164,8 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type)
creatureType = msg->getU8();
if (creatureType == Proto::CreatureTypeSummonOwn)
msg->getU32(); // master
if (g_game.getClientVersion() >= 1220 && creatureType == Proto::CreatureTypePlayer)
msg->getU8(); // vocation id
}
if(g_game.getFeature(Otc::GameCreatureIcons)) {

5
src/client/protocolgamesend.cpp
View File

@@ -802,6 +802,11 @@ void ProtocolGame::sendChangeOutfit(const Outfit& outfit)
{
OutputMessagePtr msg(new OutputMessage);
msg->addU8(Proto::ClientChangeOutfit);
if (g_game.getFeature(Otc::GameTibia12Protocol) && g_game.getClientVersion() >= 1220) {
msg->addU8(0); // outfit type
}
if(g_game.getFeature(Otc::GameLooktypeU16))
msg->addU16(outfit.getId());
else