From 80529930ea3bc874c8da22c66343745ff6fdd45b Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 24 Feb 2024 00:10:27 +0000
Subject: Simplify vector addition/subtraction with differnt types

Automatically applies correct rounding with float to int operations, adjusts test
expectations accordingly.
---
 game/geoData.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'game/geoData.cpp')

diff --git a/game/geoData.cpp b/game/geoData.cpp
index b30a35b..359e8c0 100644
--- a/game/geoData.cpp
+++ b/game/geoData.cpp
@@ -204,8 +204,7 @@ GeoData::intersectRay(const Ray<GlobalPosition3D> & ray, FaceHandle face) const
 {
 	std::optional<GlobalPosition3D> out;
 	walkUntil(PointFace {ray.start, face},
-			ray.start.xy()
-					+ GlobalPosition2D(ray.direction.xy() * RelativePosition2D(upperExtent.xy() - lowerExtent.xy())),
+			ray.start.xy() + (ray.direction.xy() * RelativePosition2D(upperExtent.xy() - lowerExtent.xy())),
 			[&out, &ray, this](FaceHandle face) {
 				BaryPosition bari {};
 				RelativeDistance dist {};
-- 
cgit v1.2.3