# HG changeset patch
# User Grumpy7
# Date 1383470406 28800
# Node ID 012fcb1f223aa125b82bcd707009c815af5e6392
# Parent  84fa3c83d63fec2aeec4c9b21bf6c640bbacffe3# Parent  33787c8938a554f6ce1b8abca71165747458db2a
Merge

diff -r 33787c8938a5 -r 012fcb1f223a Party.cpp
--- a/Party.cpp	Sat Nov 02 17:45:58 2013 +0000
+++ b/Party.cpp	Sun Nov 03 01:20:06 2013 -0800
@@ -1122,7 +1122,7 @@
     v8 = 0;
     for (int i = 0; i < 4; i++)
     {
-      v9 = &pPlayers[(uActiveCharacter + 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 )
       {