comparison Vis.cpp @ 1525:863de6ec906b

Слияние
author Ritor1
date Thu, 05 Sep 2013 13:31:15 +0600
parents 965af46e8793
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1524:58d15177edd0 1525:863de6ec906b
1431 if (v8 != OBJECT_Decoration) 1431 if (v8 != OBJECT_Decoration)
1432 { 1432 {
1433 MessageBoxA(nullptr, "Unsupported \"exclusion if no event\" type in CVis::is_part_of_selection", "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Vis.cpp:207", 0); 1433 MessageBoxA(nullptr, "Unsupported \"exclusion if no event\" type in CVis::is_part_of_selection", "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Vis.cpp:207", 0);
1434 return true; 1434 return true;
1435 } 1435 }
1436 if (pLevelDecorations[object_idx].uCog || pLevelDecorations[object_idx].field_16_event_id) 1436 if (pLevelDecorations[object_idx].uCog || pLevelDecorations[object_idx].uEventID)
1437 return true; 1437 return true;
1438 return pLevelDecorations[object_idx].IsInteractive(); 1438 return pLevelDecorations[object_idx].IsInteractive();
1439 } 1439 }
1440 if (object_type == filter->object_id) 1440 if (object_type == filter->object_id)
1441 { 1441 {