Mercurial > mm7

comparison Viewport.cpp @ 1514:965af46e8793

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename LevelDecoration::field_16_event_id to LevelDecoration::uEventID.
author yoctozepto
date Tue, 03 Sep 2013 15:09:07 +0200
parents 61010a655c94
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1513:4055b09160ae 1514:965af46e8793
531 pIcons_LOD->pTextures[pTextureID].Release(); 531 pIcons_LOD->pTextures[pTextureID].Release();
532 pMouse->RemoveHoldingItem(); 532 pMouse->RemoveHoldingItem();
533 pIcons_LOD->SyncLoadedFilesCount(); 533 pIcons_LOD->SyncLoadedFilesCount();
534 return; 534 return;
535 } 535 }
536 if ( !pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].field_16_event_id ) 536 if ( !pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].uEventID )
537 { 537 {
538 if ( pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].IsInteractive() ) 538 if ( pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].IsInteractive() )
539 { 539 {
540 v15 = stru_5E4C90._decor_events[pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3]._idx_in_stru123 - 75] + 380; 540 v15 = stru_5E4C90._decor_events[pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3]._idx_in_stru123 - 75] + 380;
541 activeLevelDecoration = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3]; 541 activeLevelDecoration = &pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3];
542 EventProcessor(v15, 0, 1); 542 EventProcessor(v15, 0, 1);
543 activeLevelDecoration = NULL; 543 activeLevelDecoration = NULL;
544 } 544 }
545 return; 545 return;
546 } 546 }
547 pEventID = pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].field_16_event_id; 547 pEventID = pLevelDecorations[(signed int)(unsigned __int16)v0 >> 3].uEventID;
548 } 548 }
549 if ( PID_TYPE(v0) == OBJECT_BModel && HIWORD(v0) < clickable_distance) 549 if ( PID_TYPE(v0) == OBJECT_BModel && HIWORD(v0) < clickable_distance)
550 { 550 {
551 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor) 551 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
552 { 552 {