Mercurial > mm7

diff mm7_3.cpp @ 768:67b77b052ef3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 23 Mar 2013 21:16:04 +0200
parents 45615cacad31 90bcfb56c8f9
children c319601893af
line wrap: on
line diff
--- a/mm7_3.cpp	Sat Mar 23 21:11:15 2013 +0200
+++ b/mm7_3.cpp	Sat Mar 23 21:16:04 2013 +0200
@@ -3046,20 +3046,14 @@
       if ( !v107
         && !(BYTE1(pOutdoor->pBModels[pParty->field_6F4_packedid >> 9].pFaces[(pParty->field_6F4_packedid >> 3) & 0x3F].uAttributes) & 0x20) )
       {
-        v96 = 0;
-        v94 = 0;
-        v92 = 0;
-        v91 = 0;
+        
         v90 = -1;
         v89 = 1;
         v88 = 804;
         v87 = 64;
         goto LABEL_257;
       }
-      v96 = 0;
-      v94 = 0;
-      v92 = 0;
-      v91 = 0;
+     
       v90 = -1;
       v89 = 1;
       v88 = 804;
@@ -3067,7 +3061,7 @@
 LABEL_255:
       v63 = WorldPosToGridCellZ(pParty->vPosition.y) - 1;
       v64 = WorldPosToGridCellX(pParty->vPosition.x);
-      v87 = pOutdoor->_47EE49(v64, v63, v86);
+      v87 = pOutdoor->GetSoundIdByPosition(v64, v63, v86);
       goto LABEL_257;
     }
     if ( v124 && (!bJumping || v101) )
@@ -3075,26 +3069,19 @@
       if ( v107
         || BYTE1(pOutdoor->pBModels[pParty->field_6F4_packedid >> 9].pFaces[(pParty->field_6F4_packedid >> 3) & 0x3F].uAttributes) & 0x20 )
       {
-        v96 = 0;
-        v94 = 0;
-        v92 = 0;
-        v91 = 0;
+        
         v90 = -1;
         v89 = 1;
         v88 = 804;
         v86 = 0;
         goto LABEL_255;
       }
-      v96 = 0;
-      v94 = 0;
-      v92 = 0;
-      v91 = 0;
       v90 = -1;
       v89 = 1;
       v88 = 804;
       v87 = 103;
 LABEL_257:
-      pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, v91, v92, v94, v96);
+      pAudioPlayer->PlaySound((SoundID)v87, v88, v89, v90, 0, 0, 0, 0);
     }
     else
     {