diff --git a/apps/openmw/mwmp/DedicatedActor.cpp b/apps/openmw/mwmp/DedicatedActor.cpp index f8f0a041a..cc289a8ed 100644 --- a/apps/openmw/mwmp/DedicatedActor.cpp +++ b/apps/openmw/mwmp/DedicatedActor.cpp @@ -333,22 +333,22 @@ void DedicatedActor::playSound() } } -bool DedicatedActor::hasItem(std::string refId, int charge) +bool DedicatedActor::hasItem(std::string itemId, int charge) { for (const auto &itemPtr : ptr.getClass().getInventoryStore(ptr)) { - if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), refId) && itemPtr.getCellRef().getCharge() == charge) + if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), itemId) && itemPtr.getCellRef().getCharge() == charge) return true; } return false; } -void DedicatedActor::equipItem(std::string refId, int charge) +void DedicatedActor::equipItem(std::string itemId, int charge) { for (const auto &itemPtr : ptr.getClass().getInventoryStore(ptr)) { - if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), refId) && itemPtr.getCellRef().getCharge() == charge) + if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), itemId) && itemPtr.getCellRef().getCharge() == charge) { std::shared_ptr action = itemPtr.getClass().use(itemPtr); action->execute(ptr); diff --git a/apps/openmw/mwmp/DedicatedActor.hpp b/apps/openmw/mwmp/DedicatedActor.hpp index 438d79d34..8824b4347 100644 --- a/apps/openmw/mwmp/DedicatedActor.hpp +++ b/apps/openmw/mwmp/DedicatedActor.hpp @@ -26,8 +26,8 @@ namespace mwmp void playAnimation(); void playSound(); - bool hasItem(std::string refId, int charge); - void equipItem(std::string refId, int charge); + bool hasItem(std::string itemId, int charge); + void equipItem(std::string itemId, int charge); MWWorld::Ptr getPtr(); void setPtr(const MWWorld::Ptr& newPtr); diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp index 2c0df877f..74004de13 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.cpp +++ b/apps/openmw/mwmp/DedicatedPlayer.cpp @@ -255,10 +255,10 @@ void DedicatedPlayer::setAnimFlags() ptr.getClass().getCreatureStats(ptr).getActiveSpells().purgeEffect(ESM::MagicEffect::Levitate); else if (isFlying && !world->isFlying(ptr)) { - MWMechanics::CastSpell cast(ptr, ptr); - cast.mHitPosition = ptr.getRefData().getPosition().asVec3(); - cast.mAlwaysSucceed = true; - cast.cast("Levitate"); + MWMechanics::CastSpell levitationCast(ptr, ptr); + levitationCast.mHitPosition = ptr.getRefData().getPosition().asVec3(); + levitationCast.mAlwaysSucceed = true; + levitationCast.cast("Levitate"); } MWMechanics::CreatureStats *ptrCreatureStats = &ptr.getClass().getCreatureStats(ptr); diff --git a/apps/openmw/mwmp/GUI/GUIChat.cpp b/apps/openmw/mwmp/GUI/GUIChat.cpp index d2fcc3758..3bb8fead5 100644 --- a/apps/openmw/mwmp/GUI/GUIChat.cpp +++ b/apps/openmw/mwmp/GUI/GUIChat.cpp @@ -250,8 +250,8 @@ namespace mwmp } } - void GUIChat::setDelay(float delay) + void GUIChat::setDelay(float newDelay) { - this->delay = delay; + this->delay = newDelay; } } diff --git a/apps/openmw/mwmp/GUI/GUIChat.hpp b/apps/openmw/mwmp/GUI/GUIChat.hpp index 447aa6028..e66f10b2a 100644 --- a/apps/openmw/mwmp/GUI/GUIChat.hpp +++ b/apps/openmw/mwmp/GUI/GUIChat.hpp @@ -35,7 +35,7 @@ namespace mwmp void pressedChatMode(); //switch chat mode void pressedSay(); // switch chat focus (if chat mode != CHAT_DISABLED) - void setDelay(float delay); + void setDelay(float newDelay); void update(float dt); diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp index 99853aa1a..87d8775d2 100644 --- a/apps/openmw/mwmp/GUIController.cpp +++ b/apps/openmw/mwmp/GUIController.cpp @@ -329,9 +329,9 @@ ESM::CustomMarker mwmp::GUIController::createMarker(const RakNet::RakNetGUID &gu void mwmp::GUIController::updatePlayersMarkers(MWGui::LocalMapBase *localMapBase) { - std::vector::iterator it = localMapBase->mPlayerMarkerWidgets.begin(); - for (; it != localMapBase->mPlayerMarkerWidgets.end(); ++it) - MyGUI::Gui::getInstance().destroyWidget(*it); + std::vector::iterator markerWidgetIterator = localMapBase->mPlayerMarkerWidgets.begin(); + for (; markerWidgetIterator != localMapBase->mPlayerMarkerWidgets.end(); ++markerWidgetIterator) + MyGUI::Gui::getInstance().destroyWidget(*markerWidgetIterator); localMapBase->mPlayerMarkerWidgets.clear(); for (int dX = -localMapBase->mCellDistance; dX <= localMapBase->mCellDistance; ++dX) @@ -345,9 +345,10 @@ void mwmp::GUIController::updatePlayersMarkers(MWGui::LocalMapBase *localMapBase cellId.mIndex.mY = localMapBase->mCurY+dY; PlayerMarkerCollection::RangeType markers = mPlayerMarkers.getMarkers(cellId); - for (PlayerMarkerCollection::ContainerType::const_iterator it = markers.first; it != markers.second; ++it) + for (PlayerMarkerCollection::ContainerType::const_iterator markerIterator = markers.first; + markerIterator != markers.second; ++markerIterator) { - const ESM::CustomMarker &marker = it->second; + const ESM::CustomMarker &marker = markerIterator->second; MWGui::LocalMapBase::MarkerUserData markerPos (localMapBase->mLocalMapRender); MyGUI::IntPoint widgetPos = localMapBase->getMarkerPosition(marker.mWorldX, marker.mWorldY, markerPos); diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp index 57c126db1..f09a13b13 100644 --- a/apps/openmw/mwmp/LocalPlayer.cpp +++ b/apps/openmw/mwmp/LocalPlayer.cpp @@ -1345,12 +1345,12 @@ void LocalPlayer::setSelectedSpell() int(MWMechanics::getSpellSuccessChance(selectedSpellId, ptrPlayer))); } -void LocalPlayer::sendDeath(char deathState) +void LocalPlayer::sendDeath(char newDeathState) { if (MechanicsHelper::isEmptyTarget(killer)) killer = MechanicsHelper::getTarget(getPlayerPtr()); - this->deathState = deathState; + deathState = newDeathState; LOG_MESSAGE_SIMPLE(TimedLog::LOG_INFO, "Sending ID_PLAYER_DEATH about myself to server\n- deathState: %d", deathState); getNetworking()->getPlayerPacket(ID_PLAYER_DEATH)->setPlayer(this); @@ -1683,7 +1683,7 @@ void LocalPlayer::clearCurrentContainer() currentContainer.mpNum = 0; } -void LocalPlayer::storeCellState(const ESM::Cell& cell, int stateType) +void LocalPlayer::storeCellState(const ESM::Cell& storedCell, int stateType) { std::vector::iterator iter; @@ -1691,14 +1691,14 @@ void LocalPlayer::storeCellState(const ESM::Cell& cell, int stateType) { // If there's already a cell state recorded for this particular cell, // remove it - if (cell.getDescription() == (*iter).cell.getDescription()) + if (storedCell.getDescription() == (*iter).cell.getDescription()) iter = cellStateChanges.erase(iter); else ++iter; } CellState cellState; - cellState.cell = cell; + cellState.cell = storedCell; cellState.type = stateType; cellStateChanges.push_back(cellState); diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp index bc6557377..2168a8d6f 100644 --- a/apps/openmw/mwmp/LocalPlayer.hpp +++ b/apps/openmw/mwmp/LocalPlayer.hpp @@ -75,7 +75,7 @@ namespace mwmp void setMarkLocation(); void setSelectedSpell(); - void sendDeath(char deathState); + void sendDeath(char newDeathState); void sendClass(); void sendInventory(); void sendItemChange(const mwmp::Item& item, unsigned int action);