Mercurial > mm7

comparison mm7_2.cpp @ 569:f451efdb7c8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Party buff icons drawing (right panel) * Water Walk works & draws * Fly works & draws * Invisibility sfx works * Some player buff icons draw
author Nomad
date Tue, 05 Mar 2013 16:14:22 +0200
parents a09757c2c5e1
children 0455b0405c17 7c0763248a87 f8a4a2e0b4c9
comparison
equal deleted inserted replaced
568:6f7d936edc9b 569:f451efdb7c8b
15866 || pParty->vPosition.y < -22528 15866 || pParty->vPosition.y < -22528
15867 || pParty->vPosition.y > 22528 ) 15867 || pParty->vPosition.y > 22528 )
15868 { 15868 {
15869 strcpy(pOutdoor->pLevelFilename, pCurrentMapName); 15869 strcpy(pOutdoor->pLevelFilename, pCurrentMapName);
15870 v0 = pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, (char *)&pOut, 32); 15870 v0 = pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, (char *)&pOut, 32);
15871 if ( !bUnderwater && (pParty->uFlags & 0x8C || BYTE1(pParty->uFlags) & 2 || pParty->bFlying) || !v0 ) 15871 if ( !bUnderwater && (pParty->uFlags & (PARTY_FLAGS_1_STANDING_ON_WATER | PARTY_FLAGS_1_FALLING | 0x04) || pParty->uFlags & 0x0200 || pParty->bFlying) || !v0 )
15872 { 15872 {
15873 if ( pParty->vPosition.x < -22528 ) 15873 if ( pParty->vPosition.x < -22528 )
15874 pParty->vPosition.x = -22528; 15874 pParty->vPosition.x = -22528;
15875 if ( pParty->vPosition.x > 22528 ) 15875 if ( pParty->vPosition.x > 22528 )
15876 pParty->vPosition.x = 22528; 15876 pParty->vPosition.x = 22528;