mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 12:39:40 +00:00
Code Issues Releases Wiki Activity

[Server] Fix variable shadowing in Player

Browse source
This commit is contained in:
David Cernat 2017-11-26 13:14:53 +02:00
parent a796f81444
commit 901fe72471
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/openmw-mp/Player.cpp
View file

@ -219,9 +219,9 @@ unsigned short Player::getId()
return id; return id;
} }
void Player::setId(unsigned short id) void Player::setId(unsigned short newId)
{ {
this->id = id; this->id = newId;
} }
bool Player::isHandshaked() bool Player::isHandshaked()
@ -477,50 +477,50 @@ bool Player::isCreatureName() const
return useCreatureName; return useCreatureName;
} }
std::tuple<int, int> Player::getAttribute(unsigned short id) const std::tuple<int, int> Player::getAttribute(unsigned short attributeId) const
{ {
if (id >= ESM::Attribute::Length) if (attributeId >= ESM::Attribute::Length)
return make_tuple(0, 0); return make_tuple(0, 0);
return make_tuple(creatureStats.mAttributes[id].mBase, creatureStats.mAttributes[id].mCurrent); return make_tuple(creatureStats.mAttributes[attributeId].mBase, creatureStats.mAttributes[attributeId].mCurrent);
} }
void Player::setAttribute(unsigned short id, int base, int current) void Player::setAttribute(unsigned short attributeId, int base, int current)
{ {
if (id >= ESM::Attribute::Length) if (attributeId >= ESM::Attribute::Length)
return; return;
creatureStats.mAttributes[id].mBase = base; creatureStats.mAttributes[attributeId].mBase = base;
creatureStats.mAttributes[id].mCurrent = current; creatureStats.mAttributes[attributeId].mCurrent = current;
if (!Utils::vectorContains(&attributeChanges.attributeIndexes, id)) if (!Utils::vectorContains(&attributeChanges.attributeIndexes, attributeId))
attributeChanges.attributeIndexes.push_back(id); attributeChanges.attributeIndexes.push_back(attributeId);
attributesChanged = true; attributesChanged = true;
} }
std::tuple<int, int, float> Player::getSkill(unsigned short id) const std::tuple<int, int, float> Player::getSkill(unsigned short skillId) const
{ {
if (id >= ESM::Skill::Length) if (skillId >= ESM::Skill::Length)
return make_tuple(0, 0, 0.0f); return make_tuple(0, 0, 0.0f);
const auto &skill = npcStats.mSkills[id]; const auto &skill = npcStats.mSkills[skillId];
return make_tuple(skill.mBase, skill.mCurrent, skill.mProgress); return make_tuple(skill.mBase, skill.mCurrent, skill.mProgress);
} }
void Player::setSkill(unsigned short id, int base, int current, float progress) void Player::setSkill(unsigned short skillId, int base, int current, float progress)
{ {
if (id >= ESM::Skill::Length) if (skillId >= ESM::Skill::Length)
return; return;
auto &skill = npcStats.mSkills[id]; auto &skill = npcStats.mSkills[skillId];
skill.mBase = base; skill.mBase = base;
skill.mCurrent = current; skill.mCurrent = current;
skill.mProgress = progress; skill.mProgress = progress;
if (!Utils::vectorContains(&skillChanges.skillIndexes, id)) if (!Utils::vectorContains(&skillChanges.skillIndexes, skillId))
skillChanges.skillIndexes.push_back(id); skillChanges.skillIndexes.push_back(skillId);
skillsChanged = true; skillsChanged = true;
} }