Mercurial > mm7

comparison Outdoor.cpp @ 1489:a27cdb3d753e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of LevelDecoration and related.
author yoctozepto
date Thu, 29 Aug 2013 22:22:33 +0200
parents 7ef4b64f6329
children 965af46e8793
comparison
equal deleted inserted replaced
1488:f62e6d06acac 1489:a27cdb3d753e
2269 for (uint i = 0; i < uNumLevelDecorations; ++i) 2269 for (uint i = 0; i < uNumLevelDecorations; ++i)
2270 { 2270 {
2271 //thisa = (int)&pLevelDecorations[0].field_2; 2271 //thisa = (int)&pLevelDecorations[0].field_2;
2272 //do 2272 //do
2273 //{ 2273 //{
2274 memcpy(&pLevelDecorations[i].field_2, pSrc, 2); 2274 memcpy(&pLevelDecorations[i].uFlags, pSrc, 2);
2275 pSrc += 2; 2275 pSrc += 2;
2276 //thisa += 32; 2276 //thisa += 32;
2277 //v85 = (char *)v85 + 2; 2277 //v85 = (char *)v85 + 2;
2278 //++v151; 2278 //++v151;
2279 //} 2279 //}
2715 pSoundList->LoadSound(v4, 0); 2715 pSoundList->LoadSound(v4, 0);
2716 v5 = _6807E0_num_decorations_with_sounds_6807B8++; 2716 v5 = _6807E0_num_decorations_with_sounds_6807B8++;
2717 _6807B8_level_decorations_ids[v5] = i; 2717 _6807B8_level_decorations_ids[v5] = i;
2718 } 2718 }
2719 if ( v8 && decor->uCog == 20 ) 2719 if ( v8 && decor->uCog == 20 )
2720 decor->field_2 |= 0x0040u; 2720 decor->uFlags |= LEVEL_DECORATION_OBELISK_CHEST;
2721 if ( !decor->field_16_event_id ) 2721 if ( !decor->field_16_event_id )
2722 { 2722 {
2723 if ( decor->IsInteractive() ) 2723 if ( decor->IsInteractive() )
2724 { 2724 {
2725 if ( v1 < 124 ) 2725 if ( v1 < 124 )
2726 { 2726 {
2727 v6 = v1 + 75; 2727 v6 = v1 + 75;
2728 decor->_idx_in_stru123 = v6; 2728 decor->_idx_in_stru123 = v6;
2729 if ( !stru_5E4C90._decor_events[v1++] ) 2729 if ( !stru_5E4C90._decor_events[v1++] )
2730 decor->field_2 |= 0x0020u; 2730 decor->uFlags |= LEVEL_DECORATION_INVISIBLE;
2731 } 2731 }
2732 } 2732 }
2733 } 2733 }
2734 } 2734 }
2735 2735