Mercurial > mm7
comparison mm7_4.cpp @ 446:096c9a146ed0
Слияние
| author | Ritor1 |
|---|---|
| date | Sat, 23 Feb 2013 21:42:43 +0600 |
| parents | d0355e4f9be8 d8b3056df4e2 |
| children | ee47cc585e1b |
comparison
equal
deleted
inserted
replaced
| 445:d0355e4f9be8 | 446:096c9a146ed0 |
|---|---|
| 14387 { | 14387 { |
| 14388 v10 = v9 - 6; | 14388 v10 = v9 - 6; |
| 14389 if ( v10 ) | 14389 if ( v10 ) |
| 14390 { | 14390 { |
| 14391 if ( v10 != 8 ) | 14391 if ( v10 != 8 ) |
| 14392 Actor::_403F58(v20, v17, 32, &v14); | 14392 Actor::AI_StandOrBored(v20, v17, 32, &v14); |
| 14393 } | 14393 } |
| 14394 } | 14394 } |
| 14395 } | 14395 } |
| 14396 else | 14396 else |
| 14397 { | 14397 { |