Mercurial > mm7

comparison mm7_3.cpp @ 792:41b4e9769863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Walking in BLV iproved drastically.
author Nomad
date Mon, 25 Mar 2013 07:32:38 +0200
parents 346f7069676a
children 472ca68386d4
comparison
equal deleted inserted replaced
791:346f7069676a 792:41b4e9769863
1604 uSectorID = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z); 1604 uSectorID = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->vPosition.z);
1605 v72 = 0; 1605 v72 = 0;
1606 v78 = 0; 1606 v78 = 0;
1607 v71 = 0; 1607 v71 = 0;
1608 bJumping = 0; 1608 bJumping = 0;
1609
1610 uFaceID = -1;
1609 v80 = collide_against_floor(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID); 1611 v80 = collide_against_floor(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID);
1612 assert(uFaceID != -1);
1613
1614 for (uint i = 0; i < pIndoor->uNumFaces; ++i)
1615 pIndoor->pFaces[i].uAttributes &= ~FACE_OUTLINED;
1616 pIndoor->pFaces[uFaceID].uAttributes |= FACE_OUTLINED;
1617
1610 if ( pParty->bFlying ) 1618 if ( pParty->bFlying )
1611 { 1619 {
1612 pParty->bFlying = false; 1620 pParty->bFlying = false;
1613 if (pParty->FlyActive()) 1621 if (pParty->FlyActive())
1614 pOtherOverlayList->pOverlays[pParty->pPartyBuffs[PARTY_BUFF_FLY].uOverlayID - 1].field_E |= 1; 1622 pOtherOverlayList->pOverlays[pParty->pPartyBuffs[PARTY_BUFF_FLY].uOverlayID - 1].field_E |= 1;
15093 } 15101 }
15094 else 15102 else
15095 { 15103 {
15096 Actor::Die(v84); 15104 Actor::Die(v84);
15097 if ( v5->pMonsterInfo.uExp ) 15105 if ( v5->pMonsterInfo.uExp )
15098 sub_4269A2_GivePartyExp(pMonsterStats->pInfos[v5->pMonsterInfo.uID].uExp); 15106 GivePartyExp(pMonsterStats->pInfos[v5->pMonsterInfo.uID].uExp);
15099 } 15107 }
15100 } 15108 }
15101 } 15109 }
15102 ++v84; 15110 ++v84;
15103 ++v5; 15111 ++v5;