Mercurial > mm7

changeset 1898:dd9d4b7c1199

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing a small bug in Party::AddItemToParty + removing unreachable return
author Grumpy7
date Sun, 20 Oct 2013 23:12:09 -0700
parents 436553b0603c
children 948c43b11599 768590235c2c
files Items.cpp Party.cpp
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Items.cpp	Sun Oct 20 22:58:27 2013 -0700
+++ b/Items.cpp	Sun Oct 20 23:12:09 2013 -0700
@@ -2395,7 +2395,6 @@
   }
   std::map<CHARACTER_ATTRIBUTE_TYPE, CEnchantment*>* currList = bonusList->second;
   return (currList->find(attrToGet) != currList->end());
-  return false;
 }
 
 ITEM_EQUIP_TYPE ItemGen::GetItemEquipType()
--- a/Party.cpp	Sun Oct 20 22:58:27 2013 -0700
+++ b/Party.cpp	Sun Oct 20 23:12:09 2013 -0700
@@ -1120,10 +1120,9 @@
     v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE);
     v21 = areWeLoadingTexture;
     v8 = 0;
-    int startId = uActiveCharacter >= 0 ? uActiveCharacter - 1 : 0;
     for (int i = 0; i < 4; i++)
     {
-      v9 = &pPlayers[(startId + i) % 4];  //start with current active player, then cycle right if item won't fit
+      v9 = &pPlayers[(uActiveCharacter + i) % 4];  //start with current active player, then cycle right if item won't fit
       v10 = v9->AddItem(-1, pItem->uItemID);
       if ( v10 )
       {