Mercurial > mm7

comparison mm7_4.cpp @ 380:2f67762d04f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DecorationDesc: flags -> methods
author Nomad
date Fri, 22 Feb 2013 22:34:35 +0200
parents edd2d8b7e3c4
children 39a60868e9c7
comparison
equal deleted inserted replaced
379:5bea494a2365 380:2f67762d04f6
1163 { 1163 {
1164 v1 = &pLevelDecorations[v0->pDecorationIDs[i]]; 1164 v1 = &pLevelDecorations[v0->pDecorationIDs[i]];
1165 if ( !(v1->field_2 & 0x20) ) 1165 if ( !(v1->field_2 & 0x20) )
1166 { 1166 {
1167 v2 = &pDecorationList->pDecorations[v1->uDecorationDescID]; 1167 v2 = &pDecorationList->pDecorations[v1->uDecorationDescID];
1168 if ( !(v2->uFlags & 1) ) 1168 if (!v2->CanMoveThrough())
1169 { 1169 {
1170 v3 = v2->uRadius; 1170 v3 = v2->uRadius;
1171 v4 = v1->vPosition.x; 1171 v4 = v1->vPosition.x;
1172 if ( stru_721530.sMaxX <= v4 + v3 ) 1172 if ( stru_721530.sMaxX <= v4 + v3 )
1173 { 1173 {
1272 { 1272 {
1273 v5 = &pLevelDecorations[(signed __int16)v4 >> 3]; 1273 v5 = &pLevelDecorations[(signed __int16)v4 >> 3];
1274 if ( !(v5->field_2 & 0x20) ) 1274 if ( !(v5->field_2 & 0x20) )
1275 { 1275 {
1276 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID]; 1276 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID];
1277 if ( !(v6->uFlags & 1) ) 1277 if (!v6->CanMoveThrough())
1278 { 1278 {
1279 v7 = v6->uRadius; 1279 v7 = v6->uRadius;
1280 v8 = v5->vPosition.x; 1280 v8 = v5->vPosition.x;
1281 if ( stru_721530.sMaxX <= v8 + v7 ) 1281 if ( stru_721530.sMaxX <= v8 + v7 )
1282 { 1282 {