Mercurial > mm7

comparison mm7_3.cpp @ 904:addae461eeb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 03 Apr 2013 19:33:02 +0600
parents 279a315ff122
children a5456f17ab36 e2e692684af8
comparison
equal deleted inserted replaced
903:2fe7bcaa52e4 904:addae461eeb4
2263 { 2263 {
2264 bFeatherFall = 1; 2264 bFeatherFall = 1;
2265 break; 2265 break;
2266 } 2266 }
2267 } 2267 }
2268 // bFeatherFall = 1; 2268 else
2269 {
2270 bFeatherFall = 1;
2271 }
2269 //LABEL_9: 2272 //LABEL_9:
2270 pParty->uFlags &= ~PARTY_FLAGS_1_STANDING_ON_WATER; 2273 pParty->uFlags &= ~PARTY_FLAGS_1_STANDING_ON_WATER;
2271 if (pParty->WaterWalkActive()) 2274 if (pParty->WaterWalkActive())
2272 { 2275 {
2273 //LOBYTE(pParty->uFlags) &= 0x7Fu; 2276 //LOBYTE(pParty->uFlags) &= 0x7Fu;