From 9744ca78bb412a0b61ded3f4cc8a81104330ee9c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 1 Apr 2017 16:55:08 -0400 Subject: TITANIC: Fix vector equality operators --- engines/titanic/star_control/dvector.h | 4 ++-- engines/titanic/star_control/fvector.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/titanic/star_control') diff --git a/engines/titanic/star_control/dvector.h b/engines/titanic/star_control/dvector.h index fcb463b715..d3638cfeac 100644 --- a/engines/titanic/star_control/dvector.h +++ b/engines/titanic/star_control/dvector.h @@ -58,14 +58,14 @@ public: * Returns true if the passed vector equals this one */ bool operator==(const DVector &src) const { - return _x != src._x || _y != src._y || _z != src._z; + return _x == src._x && _y == src._y && _z == src._z; } /** * Returns true if the passed vector does not equal this one */ bool operator!=(const DVector &src) const { - return !operator==(src); + return _x != src._x || _y != src._y || _z != src._z; } DVector operator+(const DVector &delta) const { diff --git a/engines/titanic/star_control/fvector.h b/engines/titanic/star_control/fvector.h index 0dea0c32bb..dd8a25e957 100644 --- a/engines/titanic/star_control/fvector.h +++ b/engines/titanic/star_control/fvector.h @@ -79,14 +79,14 @@ public: * Returns true if the passed vector equals this one */ bool operator==(const FVector &src) const { - return _x != src._x || _y != src._y || _z != src._z; + return _x == src._x && _y == src._y && _z == src._z; } /** * Returns true if the passed vector does not equal this one */ bool operator!=(const FVector &src) const { - return !operator==(src); + return _x != src._x || _y != src._y || _z != src._z; } FVector operator+(const FVector &delta) const { -- cgit v1.2.3