@@ -184,35 +184,39 @@ int Projectile::calculateTrajectory(double accuracy)
 			targetVoxel = Position(_action.target.x*16 + 8, _action.target.y*16 + 8, _action.target.z*24 + 10);
 		}
 		test = _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, false, &_trajectory, bu);
-		Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);
 		if (test == 4 && !_trajectory.empty())
 		{
+			Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);
 			if (hitPos.x != targetTile->getPosition().x || hitPos.y != targetTile->getPosition().y)
 			{
 				_trajectory.clear();
 				return -1; // still no line of fire as we can't reach the target tile due to a unit blocking
 			}
 		}
-		if (test != -1 && !_trajectory.empty() && hitPos != _action.target)
+		if (test != -1 && !_trajectory.empty())
 		{
-			if (test == 2)
+			Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);
+			if (hitPos != _action.target)
 			{
-				if (hitPos.y - 1 == _action.target.y)
+				if (test == 2)
 				{
-					_trajectory.clear();
-					return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);
+					if (hitPos.y - 1 == _action.target.y)
+					{
+						_trajectory.clear();
+						return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);
+					}
 				}
-			}
-			if (test == 1)
-			{
-				if (hitPos.x - 1 == _action.target.x)
+				if (test == 1)
 				{
-					_trajectory.clear();
-					return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);
+					if (hitPos.x - 1 == _action.target.x)
+					{
+						_trajectory.clear();
+						return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);
+					}
 				}
+				_trajectory.clear();
+				return -1;
 			}
-			_trajectory.clear();
-			return -1;
 		}
 		_trajectory.clear();
 	}
Original file line number	Diff line number	Diff line change
`@@ -184,35 +184,39 @@ int Projectile::calculateTrajectory(double accuracy)`
`184`	`184`	`targetVoxel = Position(_action.target.x16 + 8, _action.target.y16 + 8, _action.target.z*24 + 10);`
`185`	`185`	`}`
`186`	`186`	`test = _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, false, &_trajectory, bu);`
`187`		`- Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);`
`188`	`187`	`if (test == 4 && !_trajectory.empty())`
`189`	`188`	`{`
	`189`	`+ Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);`
`190`	`190`	`if (hitPos.x != targetTile->getPosition().x \|\| hitPos.y != targetTile->getPosition().y)`
`191`	`191`	`{`
`192`	`192`	`_trajectory.clear();`
`193`	`193`	`return -1; // still no line of fire as we can't reach the target tile due to a unit blocking`
`194`	`194`	`}`
`195`	`195`	`}`
`196`		`- if (test != -1 && !_trajectory.empty() && hitPos != _action.target)`
	`196`	`+ if (test != -1 && !_trajectory.empty())`
`197`	`197`	`{`
`198`		`- if (test == 2)`
	`198`	`+ Position hitPos = Position(_trajectory.at(0).x/16, _trajectory.at(0).y/16, _trajectory.at(0).z/24);`
	`199`	`+ if (hitPos != _action.target)`
`199`	`200`	`{`
`200`		`- if (hitPos.y - 1 == _action.target.y)`
	`201`	`+ if (test == 2)`
`201`	`202`	`{`
`202`		`- _trajectory.clear();`
`203`		`- return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);`
	`203`	`+ if (hitPos.y - 1 == _action.target.y)`
	`204`	`+ {`
	`205`	`+ _trajectory.clear();`
	`206`	`+ return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);`
	`207`	`+ }`
`204`	`208`	`}`
`205`		`- }`
`206`		`- if (test == 1)`
`207`		`- {`
`208`		`- if (hitPos.x - 1 == _action.target.x)`
	`209`	`+ if (test == 1)`
`209`	`210`	`{`
`210`		`- _trajectory.clear();`
`211`		`- return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);`
	`211`	`+ if (hitPos.x - 1 == _action.target.x)`
	`212`	`+ {`
	`213`	`+ _trajectory.clear();`
	`214`	`+ return _save->getTileEngine()->calculateLine(originVoxel, targetVoxel, true, &_trajectory, bu);`
	`215`	`+ }`
`212`	`216`	`}`
	`217`	`+ _trajectory.clear();`
	`218`	`+ return -1;`
`213`	`219`	`}`
`214`		`- _trajectory.clear();`
`215`		`- return -1;`
`216`	`220`	`}`
`217`	`221`	`_trajectory.clear();`
`218`	`222`	`}`