Mercurial > mm7

changeset 2082:c15871e2d743

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wakingsound and runingsound
author Ritor1
date Fri, 06 Dec 2013 23:35:34 +0600
parents ba5cd8a8a0d3
children 69af571f793b
files NewUI/Core/UIControlModule_wrap.cxx Outdoor.cpp VideoPlayer.cpp mm7_2.cpp
diffstat 4 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/NewUI/Core/UIControlModule_wrap.cxx	Thu Dec 05 23:31:48 2013 +0400
+++ b/NewUI/Core/UIControlModule_wrap.cxx	Fri Dec 06 23:35:34 2013 +0600
@@ -726,7 +726,7 @@
  * type checking.
  * ----------------------------------------------------------------------------- */
  
-#include "../../lib/lua/lua.h"
+#include "lib/lua/lua.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/Outdoor.cpp	Thu Dec 05 23:31:48 2013 +0400
+++ b/Outdoor.cpp	Fri Dec 06 23:35:34 2013 +0600
@@ -4511,12 +4511,13 @@
 
   if ( bWalkSound && pParty->walk_sound_timer <= 0 )
   {
+    pAudioPlayer->_4AA258(804);
     v122 = abs(pParty->vPosition.x - pX);
     v126 = abs(pParty->vPosition.y - pY);
     v62 = abs(pParty->vPosition.z - pZ);
-    if ( integer_sqrt(v122 * v122 + v126 * v126 + v62 * v62) >= 8 )
+    if ( party_running_flag && (!hovering || high_fall_flag) )
     {
-      if ( party_running_flag && (!hovering || !high_fall_flag) )
+      if ( integer_sqrt(v122 * v122 + v126 * v126 + v62 * v62) >= 16 )
       {
         if ( !is_not_on_bmodel
            && !(BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20) )
@@ -4526,8 +4527,12 @@
           v87 = pOutdoor->GetSoundIdByPosition(WorldPosToGridCellX(pParty->vPosition.x), WorldPosToGridCellZ(pParty->vPosition.y) - 1, 1);
           pAudioPlayer->PlaySound((SoundID)v87, 804, 1, -1, 0, 0, 0, 0);//бег по земле
         }
+        pParty->walk_sound_timer = 96;
       }
-      else if ( party_walking_flag && (!hovering || !high_fall_flag) )
+    }
+    else if( party_walking_flag && (!hovering || high_fall_flag) )
+    {
+      if ( integer_sqrt(v122 * v122 + v126 * v126 + v62 * v62) >= 8 )
       {
         if ( is_not_on_bmodel
           || BYTE1(pOutdoor->pBModels[pParty->floor_face_pid >> 9].pFaces[(pParty->floor_face_pid >> 3) & 0x3F].uAttributes) & 0x20 )
@@ -4537,13 +4542,14 @@
         }
         else
           pAudioPlayer->PlaySound(SOUND_WalkAlong3DModel, 804, 1, -1, 0, 0, 0, 0);// хождение на 3D Modelи
+        pParty->walk_sound_timer = 64;
       }
     }
-    else
-    {
-      pAudioPlayer->_4AA258(804);
-      pParty->walk_sound_timer = 64;
-    }
+    //else
+    //{
+      //pAudioPlayer->_4AA258(804);
+      //pParty->walk_sound_timer = 64;
+    //}
   }
 
   if ( !hovering || !high_fall_flag )
--- a/VideoPlayer.cpp	Thu Dec 05 23:31:48 2013 +0400
+++ b/VideoPlayer.cpp	Fri Dec 06 23:35:34 2013 +0600
@@ -939,7 +939,7 @@
       if ( !_stricmp(this->pMightVideoHeaders[i].pVideoName, pFilename) )
       {
         SetFilePointer(this->hMightVid, this->pMightVideoHeaders[i].uFileOffset, 0, 0);
-        return SmackOpen(this->hMightVid, SMACKTRACK2|SMACKTRACK1|SMACKFILEHANDLE|SMACKLOADEXTRA|SMACKNEEDVOLUME -1);//0x7140,
+        return SmackOpen(this->hMightVid, SMACKTRACK2|SMACKTRACK1|SMACKFILEHANDLE|SMACKLOADEXTRA|SMACKNEEDVOLUME, -1);//0x7140,
       }
     }
   }
--- a/mm7_2.cpp	Thu Dec 05 23:31:48 2013 +0400
+++ b/mm7_2.cpp	Fri Dec 06 23:35:34 2013 +0600
@@ -4305,7 +4305,7 @@
 bool debug_information = false;
 bool show_picked_face = false;
 bool draw_debug_line = false;
-bool new_speed = true;
+bool new_speed = false;
 int max_flight_height = 4000;