Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-04-30 01:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized oldMaxMana variable in Player::setMana (#1152)

Browse Source
This commit is contained in:
vfjpl 2021-06-16 23:25:43 +02:00 committed by GitHub
parent 1e29b5cb01
commit 9ce2cab9ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/localplayer.cpp
View File

@ -59,7 +59,7 @@ LocalPlayer::LocalPlayer()
void LocalPlayer::lockWalk(int millis) void LocalPlayer::lockWalk(int millis)
{ {
m_walkLockExpiration = std::max<int>(m_walkLockExpiration, (ticks_t) g_clock.millis() + millis); m_walkLockExpiration = std::max<ticks_t>(m_walkLockExpiration, g_clock.millis() + millis);
} }
bool LocalPlayer::canWalk(Otc::Direction) bool LocalPlayer::canWalk(Otc::Direction)
@ -102,9 +102,10 @@ void LocalPlayer::walk(const Position& oldPos, const Position& newPos)
if(newPos == m_lastPrewalkDestination) { if(newPos == m_lastPrewalkDestination) {
updateWalk(); updateWalk();
// was to another direction, replace the walk // was to another direction, replace the walk
} else } else {
Creature::walk(oldPos, newPos); Creature::walk(oldPos, newPos);
} }
}
// no prewalk was going on, this must be an server side automated walk // no prewalk was going on, this must be an server side automated walk
else { else {
m_serverWalking = true; m_serverWalking = true;
@ -259,9 +260,10 @@ void LocalPlayer::updateWalkOffset(int totalPixelsWalked)
m_walkOffset.x = totalPixelsWalked; m_walkOffset.x = totalPixelsWalked;
else if(m_direction == Otc::West || m_direction == Otc::NorthWest || m_direction == Otc::SouthWest) else if(m_direction == Otc::West || m_direction == Otc::NorthWest || m_direction == Otc::SouthWest)
m_walkOffset.x = -totalPixelsWalked; m_walkOffset.x = -totalPixelsWalked;
} else } else {
Creature::updateWalkOffset(totalPixelsWalked); Creature::updateWalkOffset(totalPixelsWalked);
} }
}
void LocalPlayer::updateWalk() void LocalPlayer::updateWalk()
{ {
@ -425,7 +427,7 @@ void LocalPlayer::setMana(double mana, double maxMana)
{ {
if(m_mana != mana || m_maxMana != maxMana) { if(m_mana != mana || m_maxMana != maxMana) {
double oldMana = m_mana; double oldMana = m_mana;
double oldMaxMana; double oldMaxMana = m_maxMana;
m_mana = mana; m_mana = mana;
m_maxMana = maxMana; m_maxMana = maxMana;

2
src/client/localplayer.h
View File

@ -85,7 +85,7 @@ public:
double getStamina() { return m_stamina; } double getStamina() { return m_stamina; }
double getRegenerationTime() { return m_regenerationTime; } double getRegenerationTime() { return m_regenerationTime; }
double getOfflineTrainingTime() { return m_offlineTrainingTime; } double getOfflineTrainingTime() { return m_offlineTrainingTime; }
std::vector<int> getSpells() { return m_spells; } const std::vector<int>& getSpells() { return m_spells; }
ItemPtr getInventoryItem(Otc::InventorySlot inventory) { return m_inventoryItems[inventory]; } ItemPtr getInventoryItem(Otc::InventorySlot inventory) { return m_inventoryItems[inventory]; }
int getBlessings() { return m_blessings; } int getBlessings() { return m_blessings; }