mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 15:09:39 +00:00
Code Issues Releases Wiki Activity

removed unnecessary comments, added gitignore for clion cmake

Browse source
This commit is contained in:
glbwsk 2017-10-13 20:32:52 +02:00
parent ff9cb22a58
commit 83a5c7c3d8
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -7,7 +7,6 @@ Makefile
makefile makefile
build* build*
prebuilt prebuilt
cmake-build-debug/
##windows build process ##windows build process
/deps /deps
@ -27,6 +26,7 @@ Doxygen
.settings .settings
.directory .directory
.idea .idea
cmake-build-*
files/windows/*.aps files/windows/*.aps
## qt-creator ## qt-creator
CMakeLists.txt.user* CMakeLists.txt.user*

7
apps/openmw/mwworld/inventorystore.cpp
View file

@ -265,8 +265,6 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
// Autoequip clothing, armor and weapons. // Autoequip clothing, armor and weapons.
// Equipping lights is handled in Actors::updateEquippedLight based on environment light. // Equipping lights is handled in Actors::updateEquippedLight based on environment light.
// the main loop iterating through all items in inventory
for (ContainerStoreIterator iter (begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter!=end(); ++iter) for (ContainerStoreIterator iter (begin(ContainerStore::Type_Clothing | ContainerStore::Type_Armor)); iter!=end(); ++iter)
{ {
Ptr test = *iter; Ptr test = *iter;
@ -291,8 +289,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
std::pair<std::vector<int>, bool> itemsSlots = std::pair<std::vector<int>, bool> itemsSlots =
iter->getClass().getEquipmentSlots (*iter); iter->getClass().getEquipmentSlots (*iter);
// nested loop for iterating through avialable NPC slots for equipped items // checking if current item poited by iter can be equipped
// and checking if current item poited by iter can be placed there
for (std::vector<int>::const_iterator iter2 (itemsSlots.first.begin()); for (std::vector<int>::const_iterator iter2 (itemsSlots.first.begin());
iter2!=itemsSlots.first.end(); ++iter2) iter2!=itemsSlots.first.end(); ++iter2)
{ {
@ -323,7 +320,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
// if left ring is equipped // if left ring is equipped
if (*iter2 == Slot_LeftRing) if (*iter2 == Slot_LeftRing)
{ {
// if there is a place for right ring dont swap left leaving right hand empty // if there is a place for right ring dont swap it
if (slots_.at(Slot_RightRing) == end()) if (slots_.at(Slot_RightRing) == end())
{ {
continue; continue;