Skip to content

Commit

Permalink
removed unnecessary comments, added gitignore for clion cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
lukago committed Oct 13, 2017
1 parent ff9cb22 commit 83a5c7c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Makefile
makefile
build*
prebuilt
cmake-build-debug/

##windows build process
/deps
Expand All @@ -27,6 +26,7 @@ Doxygen
.settings
.directory
.idea
cmake-build-*
files/windows/*.aps
## qt-creator
CMakeLists.txt.user*
Expand Down
7 changes: 2 additions & 5 deletions apps/openmw/mwworld/inventorystore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,6 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)

// Autoequip clothing, armor and weapons.
// 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)
{
Ptr test = *iter;
Expand All @@ -291,8 +289,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
std::pair<std::vector<int>, bool> itemsSlots =
iter->getClass().getEquipmentSlots (*iter);

// nested loop for iterating through avialable NPC slots for equipped items
// and checking if current item poited by iter can be placed there
// checking if current item poited by iter can be equipped
for (std::vector<int>::const_iterator iter2 (itemsSlots.first.begin());
iter2!=itemsSlots.first.end(); ++iter2)
{
Expand Down Expand Up @@ -323,7 +320,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
// if left ring is equipped
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())
{
continue;
Expand Down

0 comments on commit 83a5c7c

Please sign in to comment.