# HG changeset patch
# User Ritor1
# Date 1374216644 -21600
# Node ID 3161094869e0b01bb65cf9418d7d67c88d7abaab
# Parent  9b091098c88c8af20dd31f0a0715a029c266be85# Parent  eb02a65e5c823deb437aff955a8af954d8da2254
Слияние

diff -r eb02a65e5c82 -r 3161094869e0 UI/Books/UISpellBook.cpp
diff -r eb02a65e5c82 -r 3161094869e0 mm7_3.cpp
--- a/mm7_3.cpp	Fri Jul 19 09:42:03 2013 +0200
+++ b/mm7_3.cpp	Fri Jul 19 12:50:44 2013 +0600
@@ -3039,24 +3039,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
@@ -3066,29 +3056,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;
 			}
@@ -3151,8 +3128,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);