Mercurial > mm7

comparison mm7_2.cpp @ 520:35f28d4c0ff9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GlobalEventInfo changed to LevelDecoration* activeLevelDecoration
author Gloval
date Fri, 01 Mar 2013 23:43:21 +0400
parents 8f70e52646eb
children 61343380715b
comparison
equal deleted inserted replaced
519:8f70e52646eb 520:35f28d4c0ff9
4302 4302
4303 if ( pMessageQueue_50CBD0->uNumMessages ) 4303 if ( pMessageQueue_50CBD0->uNumMessages )
4304 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 4304 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
4305 pKeyActionMap->_459ED1(3); 4305 pKeyActionMap->_459ED1(3);
4306 pKeyActionMap->ResetKeys(); 4306 pKeyActionMap->ResetKeys();
4307 GlobalEventInfo = 0; 4307 activeLevelDecoration = NULL;
4308 ptr_F8B1E8 = 0; 4308 ptr_F8B1E8 = 0;
4309 if ( pDialogueNPCCount ) 4309 if ( pDialogueNPCCount )
4310 { 4310 {
4311 v0 = dword_F8B19C; 4311 v0 = dword_F8B19C;
4312 if ( dword_F8B19C != 2 4312 if ( dword_F8B19C != 2
15026 if ( !pLevelDecorations[a1 >> 3].IsInteractive() ) 15026 if ( !pLevelDecorations[a1 >> 3].IsInteractive() )
15027 return 1; 15027 return 1;
15028 v10 = v8->_idx_in_stru123; 15028 v10 = v8->_idx_in_stru123;
15029 v24 = 1; 15029 v24 = 1;
15030 v11 = stru_5E4C90._decor_events[v10 - 75] + 380; 15030 v11 = stru_5E4C90._decor_events[v10 - 75] + 380;
15031 GlobalEventInfo = (int)v8; 15031 activeLevelDecoration = v8;
15032 EventProcessor(v11, 0, 1); 15032 EventProcessor(v11, 0, 1);
15033 GlobalEventInfo = 0; 15033 activeLevelDecoration = NULL;
15034 } 15034 }
15035 break; 15035 break;
15036 15036
15037 default: 15037 default:
15038 if ( (a1 & 7) != OBJECT_BModel) 15038 if ( (a1 & 7) != OBJECT_BModel)