Mercurial > mm7

comparison Indoor.cpp @ 1558:30db6d265ceb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed the new Assert macro definition slightly, Party::AddItem (for some reason in players.cpp) renamed to Party::AddItemToParty, cleaned up; some unused variables in previous functions removed
author Grumpy7
date Sat, 07 Sep 2013 23:06:13 +0200
parents 9a6567c6c76c
children c44db078127d
comparison
equal deleted inserted replaced
1555:9c4cf5b07e98 1558:30db6d265ceb
6051 ShowStatusBarString(pTmpBuf2.data(), 2u); 6051 ShowStatusBarString(pTmpBuf2.data(), 2u);
6052 if ( v19->uItemID == 506 ) 6052 if ( v19->uItemID == 506 )
6053 _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u); 6053 _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
6054 if ( v19->uItemID == 455 ) 6054 if ( v19->uItemID == 455 )
6055 _449B7E_toggle_bit(pParty->_quest_bits, 185, 1u); 6055 _449B7E_toggle_bit(pParty->_quest_bits, 185, 1u);
6056 if ( !pParty->AddItem(v19) ) 6056 if ( !pParty->AddItemToParty(v19) )
6057 pParty->SetHoldingItem(v19); 6057 pParty->SetHoldingItem(v19);
6058 v21 = v26; 6058 v21 = v26;
6059 } 6059 }
6060 SpriteObject::OnInteraction(v21); 6060 SpriteObject::OnInteraction(v21);
6061 break; 6061 break;