Mercurial > mm7

comparison GUI/UI/UiGame.cpp @ 2566:30eb6dcac768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big spell fx overhaul
author a.parshin
date Wed, 20 May 2015 21:05:07 +0200
parents f2a8ed07e921
children d87bfbd3bb3b
comparison
equal deleted inserted replaced
2565:117c219bf913 2566:30eb6dcac768
1581 uLastPointedObjectID = 0; 1581 uLastPointedObjectID = 0;
1582 return; 1582 return;
1583 } 1583 }
1584 if ( pickedObjectPID >= 0x2000000u || pParty->pPickedItem.uItemID ) 1584 if ( pickedObjectPID >= 0x2000000u || pParty->pPickedItem.uItemID )
1585 { 1585 {
1586 GameUI_SetFooterString(pSpriteObjects[pickedObjectID].stru_24.GetDisplayName()); 1586 GameUI_SetFooterString(pSpriteObjects[pickedObjectID].containing_item.GetDisplayName());
1587 } 1587 }
1588 else 1588 else
1589 { 1589 {
1590 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[470], pSpriteObjects[pickedObjectID].stru_24.GetDisplayName());// "Get %s" 1590 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[470], pSpriteObjects[pickedObjectID].containing_item.GetDisplayName());// "Get %s"
1591 GameUI_SetFooterString(pTmpBuf.data()); 1591 GameUI_SetFooterString(pTmpBuf.data());
1592 } //intentional fallthrough 1592 } //intentional fallthrough
1593 } 1593 }
1594 else if ( PID_TYPE(pickedObjectPID) == OBJECT_Decoration ) 1594 else if ( PID_TYPE(pickedObjectPID) == OBJECT_Decoration )
1595 { 1595 {