Mercurial > mm7

diff Outdoor.cpp @ 2101:ee2724b9ca05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RasterLine2D fix and etc.
author Ritor1
date Mon, 16 Dec 2013 18:43:42 +0600
parents 577c081b8019
children 9d79b07dc237
line wrap: on
line diff
--- a/Outdoor.cpp	Fri Dec 13 22:19:56 2013 +0600
+++ b/Outdoor.cpp	Mon Dec 16 18:43:42 2013 +0600
@@ -4209,10 +4209,7 @@
   {
 	  if ( !bUnderwater && v34 <= 0)
 	  {
-		if ( v34 < -500
-		  && !pParty->bFlying
-		  && pParty->vPosition.z - v111 > 1000
-		  && !pParty->FeatherFallActive())
+		if ( v34 < -500 && !pParty->bFlying && pParty->vPosition.z - v111 > 1000 && !pParty->FeatherFallActive())
 		{ // falling scream
 		  for (int i = 0; i < 4; ++i)
 		  {
@@ -4258,9 +4255,9 @@
     if ( stru_721530._47050A(v36) )
       break;
     _46E889_collide_against_bmodels(1);
-    v37 = WorldPosToGridCellZ(pParty->vPosition.y);
-    v38 = WorldPosToGridCellX(pParty->vPosition.x);
-    _46E26D_collide_against_sprites(v38, v37);
+    //v37 = WorldPosToGridCellZ(pParty->vPosition.y);
+    //v38 = WorldPosToGridCellX(pParty->vPosition.x);
+    _46E26D_collide_against_sprites(WorldPosToGridCellX(pParty->vPosition.x), WorldPosToGridCellZ(pParty->vPosition.y));
     _46ED8A_collide_against_sprite_objects(4);
     for ( i = 0; i < (signed int)uNumActors; ++i )
       Actor::_46DF1A_collide_against_actor(i, 0);