Mercurial > mm7
comparison mm7_4.cpp @ 1823:24b70fa98474
Merge
author | Grumpy7 |
---|---|
date | Wed, 09 Oct 2013 08:09:48 +0200 |
parents | 4002c0fe5efc |
children | bdac32c645c5 |
comparison
equal
deleted
inserted
replaced
1822:5f9eeb7bf8e6 | 1823:24b70fa98474 |
---|---|
121 v5 = 0; | 121 v5 = 0; |
122 v40 = a2; | 122 v40 = a2; |
123 v31 = v4; | 123 v31 = v4; |
124 v39 = 1; | 124 v39 = 1; |
125 dword_720F20[0] = 10000; | 125 dword_720F20[0] = 10000; |
126 v32 = 0; | |
127 if ( (signed int)pOutdoor->uNumBModels > 0 ) | 126 if ( (signed int)pOutdoor->uNumBModels > 0 ) |
128 { | 127 { |
129 v29 = 0; | 128 v29 = 0; |
130 do | 129 for ( v32 = 0; v32 < (signed int)pOutdoor->uNumBModels; ++v32 ) |
131 { | 130 { |
132 v6 = &pOutdoor->pBModels[v29]; | 131 v6 = &pOutdoor->pBModels[v29]; |
133 if ( v4 <= pOutdoor->pBModels[v29].sMaxX ) | 132 if ( v4 <= pOutdoor->pBModels[v29].sMaxX ) |
134 { | 133 { |
135 if ( v4 >= v6->sMinX ) | 134 if ( v4 >= v6->sMinX ) |
237 } | 236 } |
238 } | 237 } |
239 } | 238 } |
240 } | 239 } |
241 } | 240 } |
242 ++v32; | 241 //++v32; |
243 ++v29; | 242 ++v29; |
244 v5 = 0; | 243 v5 = 0; |
245 } | 244 } |
246 while ( v32 < (signed int)pOutdoor->uNumBModels ); | 245 //while ( v32 < (signed int)pOutdoor->uNumBModels ); |
247 if ( !v39 ) | 246 if ( !v39 ) |
248 { | 247 { |
249 *(int *)a4 = 0; | 248 *(int *)a4 = 0; |
250 return dword_720F20[0]; | 249 return dword_720F20[0]; |
251 } | 250 } |