Mercurial > mm7
comparison Party.cpp @ 1990:84fa3c83d63f
char picking up item off by one fixed
author | Grumpy7 |
---|---|
date | Sun, 03 Nov 2013 01:19:07 -0800 |
parents | c1c74df0a33e |
children | bb0da61e4a7e |
comparison
equal
deleted
inserted
replaced
1980:c1c74df0a33e | 1990:84fa3c83d63f |
---|---|
1120 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); | 1120 v7 = pIcons_LOD->LoadTexturePtr(v5, TEXTURE_16BIT_PALETTE); |
1121 v21 = areWeLoadingTexture; | 1121 v21 = areWeLoadingTexture; |
1122 v8 = 0; | 1122 v8 = 0; |
1123 for (int i = 0; i < 4; i++) | 1123 for (int i = 0; i < 4; i++) |
1124 { | 1124 { |
1125 v9 = &pPlayers[(uActiveCharacter + i) % 4]; //start with current active player, then cycle right if item won't fit | 1125 v9 = ::pPlayers[(uActiveCharacter + i) % 4]; //start with current active player, then cycle right if item won't fit |
1126 v10 = v9->AddItem(-1, pItem->uItemID); | 1126 v10 = v9->AddItem(-1, pItem->uItemID); |
1127 if ( v10 ) | 1127 if ( v10 ) |
1128 { | 1128 { |
1129 memcpy(&v9->pInventoryItemList[v10-1], pItem, 0x24u); | 1129 memcpy(&v9->pInventoryItemList[v10-1], pItem, 0x24u); |
1130 pItem->Reset(); | 1130 pItem->Reset(); |