Mercurial > mm7
diff mm7_3.cpp @ 1398:8557d021a31b
m
author | Ritor1 |
---|---|
date | Thu, 18 Jul 2013 09:40:05 +0600 |
parents | b99aeb077d4f |
children | 91ff22cc755b |
line wrap: on
line diff
--- a/mm7_3.cpp Tue Jul 16 14:26:13 2013 +0600 +++ b/mm7_3.cpp Thu Jul 18 09:40:05 2013 +0600 @@ -3040,24 +3040,14 @@ if ( !v107 && !(BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20) ) { - - v90 = -1; - v89 = 1; - v88 = 804; - v87 = 64; - pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0); + pAudioPlayer->PlaySound((SoundID)64, 804, 1, -1, 0, 0, 0, 0); } else { - v90 = -1; - v89 = 1; - v88 = 804; - v86 = 1; - //LABEL_255: v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1; v64 = WorldPosToGridCellX(pParty->vPosition.x); - v87 = pOutdoor->GetSoundIdByPosition(v64, v63, v86); - pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0); + v87 = pOutdoor->GetSoundIdByPosition(v64, v63, 1); + pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0); } } else @@ -3067,29 +3057,16 @@ if ( v107 || BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20 ) { - - v90 = -1; - v89 = 1; - v88 = 804; - v86 = 0; v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1; v64 = WorldPosToGridCellX(pParty->vPosition.x); - v87 = pOutdoor->GetSoundIdByPosition(v64, v63, v86); - pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0); + v87 = pOutdoor->GetSoundIdByPosition(v64, v63, 0); + pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0); } else - { - v90 = -1; - v89 = 1; - v88 = 804; - v87 = 103; - //LABEL_257: - pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0); - } + pAudioPlayer->PlaySound((SoundID)103, 804, 1, -1, 0, 0, 0, 0); } else { - //LABEL_344: pAudioPlayer->_4AA258(804); pParty->walk_sound_timer = 64; } @@ -3152,8 +3129,7 @@ do { v110 = (*v74)->GetMaxHealth(); - (*v74)->ReceiveDamage( - (signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256, + (*v74)->ReceiveDamage((signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256, DMGT_PHISYCAL); v75 = (*v74)->GetActualEndurance(); v110 = 20 - (*v74)->GetParameterBonus(v75);