changeset 1991:012fcb1f223a

Merge
author Grumpy7
date Sun, 03 Nov 2013 01:20:06 -0800
parents 84fa3c83d63f (diff) 33787c8938a5 (current diff)
children 1e5f097e1c2d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 )
       {