Mercurial > mm7

comparison mm7_6.cpp @ 1829:e4e27261d84e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sub_421B2C_PlaceInInventory_or_DropPickedItem to Party::sub_421B2C_PlaceInInventory_or_DropPickedItem
author Grumpy7
date Fri, 11 Oct 2013 07:29:14 +0200
parents 35c1e4ff6ba7
children 2e6d3cd052e0
comparison
equal deleted inserted replaced
1828:35c1e4ff6ba7 1829:e4e27261d84e
57 char *v11; // [sp-4h] [bp-3Ch]@38 57 char *v11; // [sp-4h] [bp-3Ch]@38
58 ItemGen Dst; // [sp+Ch] [bp-2Ch]@1 58 ItemGen Dst; // [sp+Ch] [bp-2Ch]@1
59 int v13; // [sp+30h] [bp-8h]@1 59 int v13; // [sp+30h] [bp-8h]@1
60 int v14; // [sp+34h] [bp-4h]@1 60 int v14; // [sp+34h] [bp-4h]@1
61 61
62 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 62 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
63 Dst.Reset(); 63 Dst.Reset();
64 v2 = 0; 64 v2 = 0;
65 v3 = ((unsigned int)&array_77EC08[1975].pEdgeList1[1] & pActor->uAttributes) == 0; 65 v3 = ((unsigned int)&array_77EC08[1975].pEdgeList1[1] & pActor->uAttributes) == 0;
66 v13 = 0; 66 v13 = 0;
67 v14 = 0; 67 v14 = 0;
123 pActor->uCarriedItemID = 0; 123 pActor->uCarriedItemID = 0;
124 if ( pActor->array_000234[0].uItemID ) 124 if ( pActor->array_000234[0].uItemID )
125 { 125 {
126 if ( !pParty->AddItemToParty(pActor->array_000234) ) 126 if ( !pParty->AddItemToParty(pActor->array_000234) )
127 { 127 {
128 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 128 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
129 pParty->SetHoldingItem(pActor->array_000234); 129 pParty->SetHoldingItem(pActor->array_000234);
130 } 130 }
131 pActor->array_000234[0].Reset(); 131 pActor->array_000234[0].Reset();
132 } 132 }
133 if ( pActor->array_000234[1].uItemID ) 133 if ( pActor->array_000234[1].uItemID )
134 { 134 {
135 if ( !pParty->AddItemToParty(&pActor->array_000234[1]) ) 135 if ( !pParty->AddItemToParty(&pActor->array_000234[1]) )
136 { 136 {
137 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 137 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
138 pParty->SetHoldingItem(&pActor->array_000234[1]); 138 pParty->SetHoldingItem(&pActor->array_000234[1]);
139 } 139 }
140 pActor->array_000234[1].Reset(); 140 pActor->array_000234[1].Reset();
141 } 141 }
142 pActor->Remove(); 142 pActor->Remove();
180 LABEL_45: 180 LABEL_45:
181 if ( pActor->array_000234[0].uItemID ) 181 if ( pActor->array_000234[0].uItemID )
182 { 182 {
183 if ( !v8->AddItemToParty(pActor->array_000234) ) 183 if ( !v8->AddItemToParty(pActor->array_000234) )
184 { 184 {
185 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 185 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
186 v8->SetHoldingItem(pActor->array_000234); 186 v8->SetHoldingItem(pActor->array_000234);
187 v13 = 1; 187 v13 = 1;
188 } 188 }
189 pActor->array_000234[0].Reset(); 189 pActor->array_000234[0].Reset();
190 } 190 }
191 if ( pActor->array_000234[1].uItemID ) 191 if ( pActor->array_000234[1].uItemID )
192 { 192 {
193 if ( !v8->AddItemToParty(&pActor->array_000234[1]) ) 193 if ( !v8->AddItemToParty(&pActor->array_000234[1]) )
194 { 194 {
195 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 195 pParty->sub_421B2C_PlaceInInventory_or_DropPickedItem();
196 v8->SetHoldingItem(&pActor->array_000234[1]); 196 v8->SetHoldingItem(&pActor->array_000234[1]);
197 v13 = 1; 197 v13 = 1;
198 } 198 }
199 pActor->array_000234[1].Reset(); 199 pActor->array_000234[1].Reset();
200 } 200 }