ok

2020-05-08 22:40:07 -07:00
parent 4cd5e08902
commit e684c6e574
8 changed files with 16 additions and 14 deletions
@@ -337,6 +337,7 @@
 		return TRUE
 	return FALSE

+/// one move is a tile.
 /obj/item/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle)		//I say predicted because there's no telling that the projectile won't change direction/location in flight.
 	if(!trajectory && isnull(forced_angle) && isnull(Angle))
 		return FALSE
@@ -344,7 +345,7 @@
 	if(!current)
 		var/turf/T = get_turf(src)
 		current = new(T.x, T.y, T.z, pixel_x, pixel_y, isnull(forced_angle)? Angle : forced_angle, pixel_increment_amount || SSprojectiles.global_pixel_increment_amount)
-	var/datum/point/vector/v = current.return_vector_after_increments(moves * SSprojectiles.global_iterations_per_move)
+	var/datum/point/vector/v = current.return_vector_after_increments(TILES_TO_PIXELS(moves) / (pixel_increment_amount || SSprojectiles.global_pixel_increment_amount))
 	return v.return_turf()

 /obj/item/projectile/proc/return_pathing_turfs_in_moves(moves, forced_angle)