try to fix gcc thinking the vectors are uninitialized

RicardoLuis0 · Oct 7, 2023 · fc90fd0 · fc90fd0
1 parent 201951f
commit fc90fd0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/playsim/actor.h b/src/playsim/actor.h
@@ -966,8 +966,8 @@ class AActor final : public DThinker
 
 	double Distance2D(AActor *other, bool absolute = false) const
 	{
-		DVector2 otherpos = absolute ? other->Pos().XY() : other->PosRelative(this).XY();
-		return (Pos().XY() - otherpos).Length();
+		DVector3 otherpos = absolute ? other->Pos() : other->PosRelative(this);
+		return (Pos().XY() - otherpos.XY()).Length();
 	}
 
 	double Distance2D(double x, double y) const
@@ -997,14 +997,14 @@ class AActor final : public DThinker
 
 	DAngle AngleTo(AActor *other, bool absolute = false)
 	{
-		DVector2 otherpos = absolute ? other->Pos().XY() : other->PosRelative(this).XY();
-		return VecToAngle(otherpos - Pos().XY());
+		DVector3 otherpos = absolute ? other->Pos() : other->PosRelative(this);
+		return VecToAngle(otherpos.XY() - Pos().XY());
 	}
 
 	DAngle AngleTo(AActor *other, double oxofs, double oyofs, bool absolute = false) const
 	{
-		DVector2 otherpos = absolute ? other->Pos().XY() : other->PosRelative(this).XY();
-		return VecToAngle(otherpos - Pos() + DVector2(oxofs, oyofs));
+		DVector3 otherpos = absolute ? other->Pos() : other->PosRelative(this);
+		return VecToAngle(otherpos.XY() - Pos().XY() + DVector2(oxofs, oyofs));
 	}
 
 	DVector2 Vec2To(AActor *other) const