Mercurial > mm7

diff mm7_3.cpp @ 2030:47ab41698f9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sudden drop in flight fix
author Ritor1
date Mon, 18 Nov 2013 13:17:12 +0600
parents 136b4d8d36f6
children 7a9477135943
line wrap: on
line diff
--- a/mm7_3.cpp	Mon Nov 18 10:07:24 2013 +0600
+++ b/mm7_3.cpp	Mon Nov 18 13:17:12 2013 +0600
@@ -2228,7 +2228,7 @@
   }
   else
     hovering = true;
-  high_fall_flag = pZ - v111 > 32;
+  high_fall_flag = pZ - v111 <= 32;
 
   if ( bWalkSound && pParty->walk_sound_timer)//timer update
   {
@@ -2550,9 +2550,6 @@
         }
       break;
 
-      default:
-        assert(false);
-
       case PARTY_Land:
         if (pParty->bFlying)
         {
@@ -2562,6 +2559,11 @@
         pParty->bFlying = false;
         pPartyActionQueue->uNumActions = 0;
       break;
+
+      default:
+        assert(false);
+
+
     }
   }
 
@@ -3036,7 +3038,7 @@
     }
     return;
   }
-  v76 = pParty->bFlying;
+  //v76 = pParty->bFlying;
   if ( pParty->bFlying || !high_fall_flag || bWaterWalk || !pModel )
     v77 = 1;
   else
@@ -3076,7 +3078,7 @@
       *(short *)v79 |= 1u;
       if ( !v122 || !v69 )
       {
-        if ( !v76 )
+        if ( !pParty->bFlying )
         {
           v80 = *(short *)v79;
           pParty->uFlags |= PARTY_FLAGS_1_STANDING_ON_WATER;