Mercurial > mm7

comparison Indoor.cpp @ 1736:c6fe09a06712

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::CompareVariable finished, renamed stru_5E4C90 to stru_5E4C90_MapPersistVars, party::field_4A0 to party::CounterEventValues
author Grumpy7
date Fri, 27 Sep 2013 10:04:45 +0200
parents a395359afc8f
children d73f4668ef94
comparison
equal deleted inserted replaced
1732:e8d477b48596 1736:c6fe09a06712
2417 } 2417 }
2418 2418
2419 2419
2420 pGameLoadingUI_ProgressBar->Progress(); 2420 pGameLoadingUI_ProgressBar->Progress();
2421 2421
2422 memcpy(&stru_5E4C90, pData, 0xC8); 2422 memcpy(&stru_5E4C90_MapPersistVars, pData, 0xC8);
2423 pData += 0xC8; 2423 pData += 0xC8;
2424 2424
2425 pGameLoadingUI_ProgressBar->Progress(); 2425 pGameLoadingUI_ProgressBar->Progress();
2426 2426
2427 memcpy(&stru1, pData, 0x38u); 2427 memcpy(&stru1, pData, 0x38u);
3872 { 3872 {
3873 if ( v35 < 124 ) 3873 if ( v35 < 124 )
3874 { 3874 {
3875 v21 = v35 + 1; 3875 v21 = v35 + 1;
3876 pDecortaion->_idx_in_stru123 = v35 + 75; 3876 pDecortaion->_idx_in_stru123 = v35 + 75;
3877 v22 = stru_5E4C90._decor_events[v21 + 74 - 75]; 3877 v22 = stru_5E4C90_MapPersistVars._decor_events[v21 + 74 - 75];
3878 v35 = v21; 3878 v35 = v21;
3879 if ( !v22 ) 3879 if ( !v22 )
3880 pDecortaion->uFlags |= LEVEL_DECORATION_INVISIBLE; 3880 pDecortaion->uFlags |= LEVEL_DECORATION_INVISIBLE;
3881 } 3881 }
3882 } 3882 }
6130 { 6130 {
6131 if ( !pLevelDecorations[PID_ID(a1)].IsInteractive() ) 6131 if ( !pLevelDecorations[PID_ID(a1)].IsInteractive() )
6132 return 1; 6132 return 1;
6133 v10 = v8->_idx_in_stru123; 6133 v10 = v8->_idx_in_stru123;
6134 v24 = 1; 6134 v24 = 1;
6135 v11 = stru_5E4C90._decor_events[v10 - 75] + 380; 6135 v11 = stru_5E4C90_MapPersistVars._decor_events[v10 - 75] + 380;
6136 activeLevelDecoration = v8; 6136 activeLevelDecoration = v8;
6137 EventProcessor(v11, 0, 1); 6137 EventProcessor(v11, 0, 1);
6138 activeLevelDecoration = NULL; 6138 activeLevelDecoration = NULL;
6139 } 6139 }
6140 break; 6140 break;