Mercurial > mm7

comparison mm7_3.cpp @ 1398:8557d021a31b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Thu, 18 Jul 2013 09:40:05 +0600
parents b99aeb077d4f
children 91ff22cc755b
comparison
equal deleted inserted replaced
1381:729635c2bb40 1398:8557d021a31b
3038 if ( v114 && (!bJumping || v101) ) 3038 if ( v114 && (!bJumping || v101) )
3039 { 3039 {
3040 if ( !v107 3040 if ( !v107
3041 && !(BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20) ) 3041 && !(BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20) )
3042 { 3042 {
3043 3043 pAudioPlayer->PlaySound((SoundID)64, 804, 1, -1, 0, 0, 0, 0);
3044 v90 = -1;
3045 v89 = 1;
3046 v88 = 804;
3047 v87 = 64;
3048 pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0);
3049 } 3044 }
3050 else 3045 else
3051 { 3046 {
3052 v90 = -1;
3053 v89 = 1;
3054 v88 = 804;
3055 v86 = 1;
3056 //LABEL_255:
3057 v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1; 3047 v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1;
3058 v64 = WorldPosToGridCellX(pParty->vPosition.x); 3048 v64 = WorldPosToGridCellX(pParty->vPosition.x);
3059 v87 = pOutdoor->GetSoundIdByPosition(v64, v63, v86); 3049 v87 = pOutdoor->GetSoundIdByPosition(v64, v63, 1);
3060 pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0); 3050 pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);
3061 } 3051 }
3062 } 3052 }
3063 else 3053 else
3064 { 3054 {
3065 if ( v124 && (!bJumping || v101) ) 3055 if ( v124 && (!bJumping || v101) )
3066 { 3056 {
3067 if ( v107 3057 if ( v107
3068 || BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20 ) 3058 || BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20 )
3069 { 3059 {
3070
3071 v90 = -1;
3072 v89 = 1;
3073 v88 = 804;
3074 v86 = 0;
3075 v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1; 3060 v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1;
3076 v64 = WorldPosToGridCellX(pParty->vPosition.x); 3061 v64 = WorldPosToGridCellX(pParty->vPosition.x);
3077 v87 = pOutdoor->GetSoundIdByPosition(v64, v63, v86); 3062 v87 = pOutdoor->GetSoundIdByPosition(v64, v63, 0);
3078 pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0); 3063 pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);
3079 } 3064 }
3080 else 3065 else
3081 { 3066 pAudioPlayer->PlaySound((SoundID)103, 804, 1, -1, 0, 0, 0, 0);
3082 v90 = -1;
3083 v89 = 1;
3084 v88 = 804;
3085 v87 = 103;
3086 //LABEL_257:
3087 pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0);
3088 }
3089 } 3067 }
3090 else 3068 else
3091 { 3069 {
3092 //LABEL_344:
3093 pAudioPlayer->_4AA258(804); 3070 pAudioPlayer->_4AA258(804);
3094 pParty->walk_sound_timer = 64; 3071 pParty->walk_sound_timer = 64;
3095 } 3072 }
3096 } 3073 }
3097 } 3074 }
3150 { 3127 {
3151 v74 = &pPlayers[1]; 3128 v74 = &pPlayers[1];
3152 do 3129 do
3153 { 3130 {
3154 v110 = (*v74)->GetMaxHealth(); 3131 v110 = (*v74)->GetMaxHealth();
3155 (*v74)->ReceiveDamage( 3132 (*v74)->ReceiveDamage((signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256,
3156 (signed int)((pParty->uFallStartY - v70) * (unsigned __int64)(signed __int64)((double)v110 * 0.1)) / 256,
3157 DMGT_PHISYCAL); 3133 DMGT_PHISYCAL);
3158 v75 = (*v74)->GetActualEndurance(); 3134 v75 = (*v74)->GetActualEndurance();
3159 v110 = 20 - (*v74)->GetParameterBonus(v75); 3135 v110 = 20 - (*v74)->GetParameterBonus(v75);
3160 (*v74)->SetRecoveryTime( 3136 (*v74)->SetRecoveryTime(
3161 (signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333)); 3137 (signed __int64)((double)v110 * flt_6BE3A4_debug_recmod1 * 2.133333333333333));