Mercurial > mm7

comparison mm7_1.cpp @ 508:00ce82758c72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 27 Feb 2013 23:24:17 +0600
parents 542ea7a55b17 4bd56919f075
children 7c86030324a5
comparison
equal deleted inserted replaced
507:542ea7a55b17 508:00ce82758c72
3616 uRestUI_FoodRequiredToRest -= 2; 3616 uRestUI_FoodRequiredToRest -= 2;
3617 if ( CheckHiredNPCSpeciality(0x30u) ) 3617 if ( CheckHiredNPCSpeciality(0x30u) )
3618 --uRestUI_FoodRequiredToRest; 3618 --uRestUI_FoodRequiredToRest;
3619 if ( uRestUI_FoodRequiredToRest < 1 ) 3619 if ( uRestUI_FoodRequiredToRest < 1 )
3620 uRestUI_FoodRequiredToRest = 1; 3620 uRestUI_FoodRequiredToRest = 1;
3621 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 98) ) 3621 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 98) )
3622 uRestUI_FoodRequiredToRest = 0; 3622 uRestUI_FoodRequiredToRest = 0;
3623 ++pIcons_LOD->uTexturePacksCount; 3623 ++pIcons_LOD->uTexturePacksCount;
3624 if ( !pIcons_LOD->uNumPrevLoadedFiles ) 3624 if ( !pIcons_LOD->uNumPrevLoadedFiles )
3625 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; 3625 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
3626 pCurrentScreen = SCREEN_REST; 3626 pCurrentScreen = SCREEN_REST;
5243 else 5243 else
5244 { 5244 {
5245 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName); 5245 sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], pItemsTable->pItems[v23].pUnidentifiedName);
5246 ShowStatusBarString(pTmpBuf2, 2u); 5246 ShowStatusBarString(pTmpBuf2, 2u);
5247 if ( v22->uItemID == 506 ) 5247 if ( v22->uItemID == 506 )
5248 _449B7E_toggle_bit(pParty->_award_bits, 184, 1u); 5248 _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
5249 if ( v22->uItemID == 455 ) 5249 if ( v22->uItemID == 455 )
5250 _449B7E_toggle_bit(pParty->_award_bits, 185, 1u); 5250 _449B7E_toggle_bit(pParty->_quest_bits, 185, 1u);
5251 if ( !pParty->AddItem(v22) ) 5251 if ( !pParty->AddItem(v22) )
5252 pParty->SetHoldingItem(v22); 5252 pParty->SetHoldingItem(v22);
5253 } 5253 }
5254 LayingItem::OnItemPickup(a2.y); 5254 LayingItem::OnItemPickup(a2.y);
5255 return; 5255 return;