Mercurial > mm7
comparison mm7_6.cpp @ 1759:845a6503f55c
fixing some itemarray zero accesses
author | Grumpy7 |
---|---|
date | Tue, 01 Oct 2013 06:17:32 +0200 |
parents | f44b6e02e81c |
children | 53c0453f4eb2 |
comparison
equal
deleted
inserted
replaced
1749:42a1874a2171 | 1759:845a6503f55c |
---|---|
249 } | 249 } |
250 } | 250 } |
251 } | 251 } |
252 else | 252 else |
253 { | 253 { |
254 if ( pActor->array_000234[3].GetItemEquipType() == 18 ) | 254 if ( pActor->array_000234[3].uItemID != 0 && pActor->array_000234[3].GetItemEquipType() == 18 ) |
255 { | 255 { |
256 v14 = pActor->array_000234[3].uSpecEnchantmentType; | 256 v14 = pActor->array_000234[3].uSpecEnchantmentType; |
257 pActor->array_000234[3].Reset(); | 257 pActor->array_000234[3].Reset(); |
258 if ( v14 ) | 258 if ( v14 ) |
259 { | 259 { |
260 party_finds_gold(v14, 0); | 260 party_finds_gold(v14, 0); |
261 viewparams->bRedrawGameUI = 1; | 261 viewparams->bRedrawGameUI = 1; |
262 } | 262 } |
263 } | 263 } |
264 } | 264 } |
265 pActor->uCarriedItemID = 1; | |
266 if ( pActor->uCarriedItemID ) | 265 if ( pActor->uCarriedItemID ) |
267 { | 266 { |
268 Dst.Reset(); | 267 Dst.Reset(); |
269 Dst.uItemID = pActor->uCarriedItemID; | 268 Dst.uItemID = pActor->uCarriedItemID; |
270 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName; | 269 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName; |