Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-19 22:13:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Priorize OpenSSL 1.0 in cmake, warning fixes

Browse Source
This commit is contained in:
Eduardo Bart
2017-11-04 09:03:57 -02:00
parent 696610bba7
commit 8b161e1a07
9 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/effect.cpp
View File

@@ -24,7 +24,7 @@
#include "map.h"
#include <framework/core/eventdispatcher.h>
void Effect::draw(const Point& dest, float scaleFactor, bool animate, int offsetX, int offsetY, LightView *lightView)
void Effect::drawEffect(const Point& dest, float scaleFactor, bool animate, int offsetX, int offsetY, LightView *lightView)
{
if(m_id == 0)
return;

2
src/client/effect.h
View File

@@ -35,7 +35,7 @@ class Effect : public Thing
};
public:
void draw(const Point& dest, float scaleFactor, bool animate, int offsetX = 0, int offsetY = 0, LightView *lightView = nullptr);
void drawEffect(const Point& dest, float scaleFactor, bool animate, int offsetX = 0, int offsetY = 0, LightView *lightView = nullptr);
void setId(uint32 id);
uint32 getId() { return m_id; }

3
src/client/protocolgameparse.cpp
View File

@@ -1351,7 +1351,7 @@ void ProtocolGame::parsePlayerStats(const InputMessagePtr& msg)
double level = msg->getU16();
double levelPercent = msg->getU8();
if(g_game.getFeature(Otc::GameExperienceBonus))
if(g_game.getFeature(Otc::GameExperienceBonus)) {
if(g_game.getClientVersion() <= 1096) {
double experienceBonus = msg->getDouble();
} else {
@@ -1361,6 +1361,7 @@ void ProtocolGame::parsePlayerStats(const InputMessagePtr& msg)
int storeBoostAddend = msg->getU16();
int huntingBoostFactor = msg->getU16();
}
}
double mana;
double maxMana;

2
src/client/tile.cpp
View File

@@ -155,7 +155,7 @@ void Tile::draw(const Point& dest, float scaleFactor, int drawFlags, LightView *
// effects
if(drawFlags & Otc::DrawEffects)
for(const EffectPtr& effect : m_effects)
effect->draw(dest - m_drawElevation*scaleFactor, scaleFactor, animate, m_position.x - g_map.getCentralPosition().x, m_position.y - g_map.getCentralPosition().y, lightView);
effect->drawEffect(dest - m_drawElevation*scaleFactor, scaleFactor, animate, m_position.x - g_map.getCentralPosition().x, m_position.y - g_map.getCentralPosition().y, lightView);
// top items
if(drawFlags & Otc::DrawOnTop)