Mercurial > mm7

comparison mm7_6.cpp @ 721:f39d5902c85a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Wed, 20 Mar 2013 17:48:51 +0600
parents e0a1fccc89b1
children 9d13d2ec35a6
comparison
equal deleted inserted replaced
720:05f7a11f4f20 721:f39d5902c85a
1414 { 1414 {
1415 Dst.Reset(); 1415 Dst.Reset();
1416 Dst.uItemID = pActor->uCarriedItemID; 1416 Dst.uItemID = pActor->uCarriedItemID;
1417 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName; 1417 v9 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
1418 if ( v14 ) 1418 if ( v14 )
1419 sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[490], v14, v9); 1419 sprintfex(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[490], v14, v9);
1420 else 1420 else
1421 sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], v9); 1421 sprintfex(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], v9);
1422 ShowStatusBarString(pTmpBuf2, 2u); 1422 ShowStatusBarString(pTmpBuf2, 2u);
1423 v4 = Dst.uItemID; 1423 v4 = Dst.uItemID;
1424 v5 = Dst.uItemID; 1424 v5 = Dst.uItemID;
1425 if ( pItemsTable->pItems[Dst.uItemID].uEquipType == 12 ) 1425 if ( pItemsTable->pItems[Dst.uItemID].uEquipType == 12 )
1426 { 1426 {
1464 { 1464 {
1465 memcpy(&Dst, &pActor->array_000234[3], sizeof(Dst)); 1465 memcpy(&Dst, &pActor->array_000234[3], sizeof(Dst));
1466 pActor->array_000234[3].Reset(); 1466 pActor->array_000234[3].Reset();
1467 v11 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName; 1467 v11 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
1468 if ( v14 ) 1468 if ( v14 )
1469 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v11); 1469 sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v11);
1470 else 1470 else
1471 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v11); 1471 sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v11);
1472 ShowStatusBarString(pTmpBuf2, 2u); 1472 ShowStatusBarString(pTmpBuf2, 2u);
1473 if ( !pParty->AddItem(&Dst) ) 1473 if ( !pParty->AddItem(&Dst) )
1474 pParty->SetHoldingItem(&Dst); 1474 pParty->SetHoldingItem(&Dst);
1475 v13 = 1; 1475 v13 = 1;
1476 } 1476 }
1483 goto LABEL_45; 1483 goto LABEL_45;
1484 } 1484 }
1485 pItemsTable->GenerateItem(v7, pActor->pMonsterInfo.uTreasureType, &Dst); 1485 pItemsTable->GenerateItem(v7, pActor->pMonsterInfo.uTreasureType, &Dst);
1486 v10 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName; 1486 v10 = pItemsTable->pItems[Dst.uItemID].pUnidentifiedName;
1487 if ( v14 ) 1487 if ( v14 )
1488 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v10); 1488 sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[490], v14, v10);
1489 else 1489 else
1490 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v10); 1490 sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v10);
1491 ShowStatusBarString(pTmpBuf2, 2u); 1491 ShowStatusBarString(pTmpBuf2, 2u);
1492 v8 = pParty; 1492 v8 = pParty;
1493 if ( !pParty->AddItem(&Dst) ) 1493 if ( !pParty->AddItem(&Dst) )
1494 pParty->SetHoldingItem(&Dst); 1494 pParty->SetHoldingItem(&Dst);
1495 v13 = 1; 1495 v13 = 1;
6317 party_finds_gold(*((int *)v449 + 3), 0); 6317 party_finds_gold(*((int *)v449 + 3), 0);
6318 viewparams->bRedrawGameUI = 1; 6318 viewparams->bRedrawGameUI = 1;
6319 } 6319 }
6320 else 6320 else
6321 { 6321 {
6322 sprintf(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName); 6322 sprintfex(pTmpBuf2, (char*)pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v450].pUnidentifiedName);
6323 ShowStatusBarString(pTmpBuf2, 2u); 6323 ShowStatusBarString(pTmpBuf2, 2u);
6324 if ( !pParty->AddItem(&pSpriteObjects[v445].stru_24) ) 6324 if ( !pParty->AddItem(&pSpriteObjects[v445].stru_24) )
6325 pParty->SetHoldingItem(&pSpriteObjects[v445].stru_24); 6325 pParty->SetHoldingItem(&pSpriteObjects[v445].stru_24);
6326 } 6326 }
6327 SpriteObject::OnInteraction(v445); 6327 SpriteObject::OnInteraction(v445);