Mercurial > mm7

comparison mm7_1.cpp @ 431:8c45cac1c5e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sun, 24 Feb 2013 00:55:51 +0200
parents 58b71c1af7d8 24936a5ff8ca
children 0a1ea44b4a0a 5e5dfedcc0ad
comparison
equal deleted inserted replaced
430:58b71c1af7d8 431:8c45cac1c5e1
4251 } 4251 }
4252 } 4252 }
4253 uLastPointedObjectID = pMouse->uPointingObjectID; 4253 uLastPointedObjectID = pMouse->uPointingObjectID;
4254 return; 4254 return;
4255 } 4255 }
4256 v22 = _444732_GetEventHintString(v25); 4256 v22 = GetEventHintString(v25);
4257 if ( !v22 ) 4257 if ( !v22 )
4258 //goto _return; 4258 //goto _return;
4259 { 4259 {
4260 if ( pMouse->uPointingObjectID == 0 ) 4260 if ( pMouse->uPointingObjectID == 0 )
4261 { 4261 {
4289 { 4289 {
4290 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor) 4290 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
4291 { 4291 {
4292 v21 = pOutdoor->pBModels[(signed int)(unsigned __int16)v18 >> 9].pFaces[v19 & 0x3F].sCogTriggeredID; 4292 v21 = pOutdoor->pBModels[(signed int)(unsigned __int16)v18 >> 9].pFaces[v19 & 0x3F].sCogTriggeredID;
4293 //goto LABEL_71; 4293 //goto LABEL_71;
4294 if ( !v21 || (v22 = _444732_GetEventHintString(v21)) == 0 ) 4294 if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
4295 //goto LABEL_73; 4295 //goto LABEL_73;
4296 { 4296 {
4297 pMouse->uPointingObjectID = 0; 4297 pMouse->uPointingObjectID = 0;
4298 //goto LABEL_50; 4298 //goto LABEL_50;
4299 uLastPointedObjectID = 1; 4299 uLastPointedObjectID = 1;
4326 pFace = &pIndoor->pFaces[v19]; 4326 pFace = &pIndoor->pFaces[v19];
4327 if ( BYTE3(pFace->uAttributes) & 6 ) 4327 if ( BYTE3(pFace->uAttributes) & 6 )
4328 { 4328 {
4329 v21 = pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID; 4329 v21 = pIndoor->pFaceExtras[pFace->uFaceExtraID].uEventID;
4330 //LABEL_71: 4330 //LABEL_71:
4331 if ( !v21 || (v22 = _444732_GetEventHintString(v21)) == 0 ) 4331 if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
4332 //goto LABEL_73; 4332 //goto LABEL_73;
4333 { 4333 {
4334 pMouse->uPointingObjectID = 0; 4334 pMouse->uPointingObjectID = 0;
4335 //goto LABEL_50; 4335 //goto LABEL_50;
4336 uLastPointedObjectID = 1; 4336 uLastPointedObjectID = 1;