Merge branch 'legion-dev' of https://github.com/simulationcraft/simc into legion-dev

Frostedmages · Frostedmages · commit 04e8fa4cfc7b · 2017-01-21T00:43:38.000-05:00
diff --git a/engine/simulationcraft.hpp b/engine/simulationcraft.hpp
@@ -4542,7 +4542,7 @@ struct player_t : public actor_t
   {
     if ( ( yards >= current.distance_to_move ) && current.moving_away <= 0 )
     {
-      x_position += current.distance_to_move;
+      //x_position += current.distance_to_move;
       current.distance_to_move = 0;
       current.movement_direction = MOVEMENT_NONE;
       buffs.raid_movement -> expire();
@@ -4551,13 +4551,13 @@ struct player_t : public actor_t
     {
       if ( current.moving_away > 0 )
       {
-        x_position -= yards;
+        //x_position -= yards;
         current.moving_away -= yards;
         current.distance_to_move += yards;
       }
       else
       {
-        x_position += yards;
+        //x_position += yards;
         current.moving_away = 0;
         current.movement_direction = MOVEMENT_TOWARDS;
         current.distance_to_move -= yards;

Original file line number	Diff line number	Diff line change
`@@ -4542,7 +4542,7 @@ struct player_t : public actor_t`
`4542`	`4542`	`{`
`4543`	`4543`	`if ( ( yards >= current.distance_to_move ) && current.moving_away <= 0 )`
`4544`	`4544`	`{`
`4545`		`- x_position += current.distance_to_move;`
	`4545`	`+ //x_position += current.distance_to_move;`
`4546`	`4546`	`current.distance_to_move = 0;`
`4547`	`4547`	`current.movement_direction = MOVEMENT_NONE;`
`4548`	`4548`	`buffs.raid_movement -> expire();`
`@@ -4551,13 +4551,13 @@ struct player_t : public actor_t`
`4551`	`4551`	`{`
`4552`	`4552`	`if ( current.moving_away > 0 )`
`4553`	`4553`	`{`
`4554`		`- x_position -= yards;`
	`4554`	`+ //x_position -= yards;`
`4555`	`4555`	`current.moving_away -= yards;`
`4556`	`4556`	`current.distance_to_move += yards;`
`4557`	`4557`	`}`
`4558`	`4558`	`else`
`4559`	`4559`	`{`
`4560`		`- x_position += yards;`
	`4560`	`+ //x_position += yards;`
`4561`	`4561`	`current.moving_away = 0;`
`4562`	`4562`	`current.movement_direction = MOVEMENT_TOWARDS;`
`4563`	`4563`	`current.distance_to_move -= yards;`