Mercurial > mm7

comparison Sprites.cpp @ 1542:7d986a396092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 07 Sep 2013 13:03:18 +0200
parents 86cb7398d2a8 a27cdb3d753e
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1541:86cb7398d2a8 1542:7d986a396092
750 { 750 {
751 v4 = *v3; 751 v4 = *v3;
752 if ( PID_TYPE(v4) == OBJECT_Decoration) 752 if ( PID_TYPE(v4) == OBJECT_Decoration)
753 { 753 {
754 v5 = &pLevelDecorations[(signed __int16)v4 >> 3]; 754 v5 = &pLevelDecorations[(signed __int16)v4 >> 3];
755 if ( !(v5->field_2 & 0x20) ) 755 if (!(v5->uFlags & LEVEL_DECORATION_INVISIBLE))
756 { 756 {
757 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID]; 757 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID];
758 if (!v6->CanMoveThrough()) 758 if (!v6->CanMoveThrough())
759 { 759 {
760 v7 = v6->uRadius; 760 v7 = v6->uRadius;