Mercurial > mm7

comparison Actor.cpp @ 723:256211e8243a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ODM_GetFloorLevel & BLV_GetFloorLevel
author Ritor1
date Thu, 21 Mar 2013 16:09:44 +0600
parents 52329962fcdb
children 7f1487b74571
comparison
equal deleted inserted replaced
722:70c5a87a1307 723:256211e8243a
4081 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor 4081 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor
4082 || (v21 = v30->vPosition.z, 4082 || (v21 = v30->vPosition.z,
4083 v27 = v30->vPosition.z, 4083 v27 = v30->vPosition.z,
4084 result = pIndoor->GetSector(v15, v17, v21), 4084 result = pIndoor->GetSector(v15, v17, v21),
4085 result == v28) 4085 result == v28)
4086 && (result = _46CEC3_get_floor_level(v15, v17, v27, result, &uFaceID), result != -30000) 4086 && (result = BLV_GetFloorLevel(v15, v17, v27, result, &uFaceID), result != -30000)
4087 && (result = abs(result - v27), result <= 1024) ) 4087 && (result = abs(result - v27), result <= 1024) )
4088 { 4088 {
4089 v23 = v30; 4089 v23 = v30;
4090 ++uNumActors; 4090 ++uNumActors;
4091 ++v23->pMonsterInfo.uSpecialAbilityDamageDiceBonus; 4091 ++v23->pMonsterInfo.uSpecialAbilityDamageDiceBonus;