Mercurial > mm7

comparison Sprites.cpp @ 1506:c76c0f6974bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 02 Sep 2013 12:03:40 +0600
parents a27cdb3d753e
children 7d986a396092
comparison
equal deleted inserted replaced
1505:6306a33af531 1506:c76c0f6974bc
751 { 751 {
752 v4 = *v3; 752 v4 = *v3;
753 if ( PID_TYPE(v4) == OBJECT_Decoration) 753 if ( PID_TYPE(v4) == OBJECT_Decoration)
754 { 754 {
755 v5 = &pLevelDecorations[(signed __int16)v4 >> 3]; 755 v5 = &pLevelDecorations[(signed __int16)v4 >> 3];
756 if ( !(v5->field_2 & 0x20) ) 756 if (!(v5->uFlags & LEVEL_DECORATION_INVISIBLE))
757 { 757 {
758 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID]; 758 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID];
759 if (!v6->CanMoveThrough()) 759 if (!v6->CanMoveThrough())
760 { 760 {
761 v7 = v6->uRadius; 761 v7 = v6->uRadius;