# HG changeset patch
# User Grumpy7
# Date 1382335929 25200
# Node ID dd9d4b7c1199cf294e55317492bd5969d62cb7c1
# Parent  436553b0603ca3bbc0837659e86f3585e8b8109f
Fixing a small bug in Party::AddItemToParty + removing unreachable return

diff -r 436553b0603c -r dd9d4b7c1199 Items.cpp
--- 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()
diff -r 436553b0603c -r dd9d4b7c1199 Party.cpp
--- 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 )
       {