Mercurial > mm7
comparison Viewport.cpp @ 1369:6b4a1c44a56f
Merge
author | Gloval |
---|---|
date | Mon, 15 Jul 2013 08:20:28 +0400 |
parents | 61010a655c94 |
children | 965af46e8793 |
comparison
equal
deleted
inserted
replaced
1368:cc2a25ce8ed2 | 1369:6b4a1c44a56f |
---|---|
289 } | 289 } |
290 else | 290 else |
291 { | 291 { |
292 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[pSpriteObjects[v21].stru_24.uItemID].pUnidentifiedName); | 292 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[pSpriteObjects[v21].stru_24.uItemID].pUnidentifiedName); |
293 ShowStatusBarString(pTmpBuf2.data(), 2u); | 293 ShowStatusBarString(pTmpBuf2.data(), 2u); |
294 if ( pSpriteObjects[v21].stru_24.uItemID == 506 ) | 294 if ( pSpriteObjects[v21].stru_24.uItemID == ITEM_ARTIFACT_SPLITTER ) |
295 _449B7E_toggle_bit(pParty->_quest_bits, 184, 1); | 295 _449B7E_toggle_bit(pParty->_quest_bits, 184, 1); |
296 if ( pSpriteObjects[v21].stru_24.uItemID == 455 ) | 296 if ( pSpriteObjects[v21].stru_24.uItemID == 455 ) |
297 _449B7E_toggle_bit(pParty->_quest_bits, 185, 1); | 297 _449B7E_toggle_bit(pParty->_quest_bits, 185, 1); |
298 if ( !pParty->AddItem(&pSpriteObjects[v21].stru_24) ) | 298 if ( !pParty->AddItem(&pSpriteObjects[v21].stru_24) ) |
299 pParty->SetHoldingItem(&pSpriteObjects[v21].stru_24); | 299 pParty->SetHoldingItem(&pSpriteObjects[v21].stru_24); |