Mercurial > mm7

changeset 1428:50d1412cd2c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 01 Aug 2013 09:26:13 +0600
parents 1987f2cca08f (current diff) 2754f373a8b3 (diff)
children c7489dd19f88
files
diffstat 3 files changed, 24 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/AudioPlayer.cpp	Thu Aug 01 09:26:05 2013 +0600
+++ b/AudioPlayer.cpp	Thu Aug 01 09:26:13 2013 +0600
@@ -535,9 +535,9 @@
 //----- (004AA258) --------------------------------------------------------
 void AudioPlayer::_4AA258(int a2)
 {
-  __debugbreak();
-  if ( this->bPlayerReady )
-  {
+  if (!bPlayerReady)
+    return;
+
     if ( this->b3DSoundInitialized && a2 && this->uNum3DSamples > 0 )
     {
       for ( uint i = 0; i < this->uNum3DSamples; ++i )
@@ -568,7 +568,6 @@
         }
       }
     }
-  }
 }
 
 //----- (004AA306) --------------------------------------------------------
--- a/Party.cpp	Thu Aug 01 09:26:05 2013 +0600
+++ b/Party.cpp	Thu Aug 01 09:26:13 2013 +0600
@@ -84,12 +84,16 @@
     uDefaultPartyHeight = 120;
     field_14 = 37;
     y_rotation_granularity = 25;
+    y_rotation_speed = 90;
+
     uWalkSpeed = 384;
-    y_rotation_speed = 90;
+    walk_sound_timer = 0;
+
     field_24 = 5;
     field_6FC = 0;
     field_708 = 15;
     field_0 = 25;
+
 }
 
 //inlined
--- a/mm7_1.cpp	Thu Aug 01 09:26:05 2013 +0600
+++ b/mm7_1.cpp	Thu Aug 01 09:26:13 2013 +0600
@@ -488,20 +488,9 @@
         {
           v10 = 0;
           v11 = *(float *)v3 == *((float *)v6 - 5);
-          if ( ! (v11 | v10 ) )
-		  {
-			  ++v21;
-			  v22 += 48;
-			  v24 += 48;
-			  v25 += 48;
-			  v4 += 48;
-			  v3 += 48;
-			  ++out_num_vertices;
-			  v23 += 48;
-			  v19 = v4;
-			  v18 = v3;
-		  }
-        }
+          if ( v11 | v10 )
+            goto LABEL_21;
+		}
       }
       else
       {
@@ -509,22 +498,22 @@
         {
           v10 = 0;
           v11 = *(float *)v3 == *((float *)v6 + 7);
-          if ( ! (v11 | v10 ) )
-		  {
-			  ++v21;
-			  v22 += 48;
-			  v24 += 48;
-			  v25 += 48;
-			  v4 += 48;
-			  v3 += 48;
-			  ++out_num_vertices;
-			  v23 += 48;
-			  v19 = v4;
-			  v18 = v3;
-		  }
+          if ( v11 | v10 )
+            goto LABEL_21;
         }
       }
+      ++v21;
+      v22 += 48;
+      v24 += 48;
+      v25 += 48;
+      v4 += 48;
+      v3 += 48;
+      ++out_num_vertices;
+      v23 += 48;
+      v19 = v4;
+      v18 = v3;
     }
+LABEL_21:
     if ( v17 )
     {
       v12 = v21;