Mercurial > mm7

comparison mm7_1.cpp @ 454:5e5dfedcc0ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 24 Feb 2013 09:18:17 +0600
parents f56c98a2ab52 8c45cac1c5e1
children 20d96ec810c8
comparison
equal deleted inserted replaced
453:eaadcb39312f 454:5e5dfedcc0ad
4249 } 4249 }
4250 } 4250 }
4251 uLastPointedObjectID = pMouse->uPointingObjectID; 4251 uLastPointedObjectID = pMouse->uPointingObjectID;
4252 return; 4252 return;
4253 } 4253 }
4254 v22 = _444732_GetEventHintString(v25); 4254 v22 = GetEventHintString(v25);
4255 if ( !v22 ) 4255 if ( !v22 )
4256 //goto _return; 4256 //goto _return;
4257 { 4257 {
4258 if ( pMouse->uPointingObjectID == 0 ) 4258 if ( pMouse->uPointingObjectID == 0 )
4259 { 4259 {
4287 { 4287 {
4288 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor) 4288 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
4289 { 4289 {
4290 v21 = pOutdoor->pBModels[(signed int)(unsigned __int16)v18 >> 9].pFaces[v19 & 0x3F].sCogTriggeredID; 4290 v21 = pOutdoor->pBModels[(signed int)(unsigned __int16)v18 >> 9].pFaces[v19 & 0x3F].sCogTriggeredID;
4291 //goto LABEL_71; 4291 //goto LABEL_71;
4292 if ( !v21 || (v22 = _444732_GetEventHintString(v21)) == 0 ) 4292 if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
4293 //goto LABEL_73; 4293 //goto LABEL_73;
4294 { 4294 {
4295 pMouse->uPointingObjectID = 0; 4295 pMouse->uPointingObjectID = 0;
4296 //goto LABEL_50; 4296 //goto LABEL_50;
4297 uLastPointedObjectID = 1; 4297 uLastPointedObjectID = 1;
4324 pFace = &pIndoor->pFaces[v19]; 4324 pFace = &pIndoor->pFaces[v19];
4325 if ( BYTE3(pFace->uAttributes) & 6 ) 4325 if ( BYTE3(pFace->uAttributes) & 6 )
4326 { 4326 {
4327 v21 = pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID; 4327 v21 = pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID;
4328 //LABEL_71: 4328 //LABEL_71:
4329 if ( !v21 || (v22 = _444732_GetEventHintString(v21)) == 0 ) 4329 if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
4330 //goto LABEL_73; 4330 //goto LABEL_73;
4331 { 4331 {
4332 pMouse->uPointingObjectID = 0; 4332 pMouse->uPointingObjectID = 0;
4333 //goto LABEL_50; 4333 //goto LABEL_50;
4334 uLastPointedObjectID = 1; 4334 uLastPointedObjectID = 1;
5247 if ( v22->uItemID == 455 ) 5247 if ( v22->uItemID == 455 )
5248 _449B7E_toggle_bit(pParty->_award_bits, 185, 1u); 5248 _449B7E_toggle_bit(pParty->_award_bits, 185, 1u);
5249 if ( !pParty->AddItem(v22) ) 5249 if ( !pParty->AddItem(v22) )
5250 pParty->SetHoldingItem(v22); 5250 pParty->SetHoldingItem(v22);
5251 } 5251 }
5252 LayingItem::_42F933(a2.y); 5252 LayingItem::OnItemPickup(a2.y);
5253 return; 5253 return;
5254 } 5254 }
5255 goto LABEL_13; 5255 goto LABEL_13;
5256 } 5256 }
5257 if ( (v0 & 7) != OBJECT_Actor) 5257 if ( (v0 & 7) != OBJECT_Actor)