From e9a567034818c5e3338120958061e4a4278d97da Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 18 Dec 2020 02:57:54 +0200
Subject: PlayerInfo functions reordered into original order, FindPlayer...
 functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small
 fixes

---
 src/math/Vector.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/math/Vector.h')

diff --git a/src/math/Vector.h b/src/math/Vector.h
index 082b296f..776bfcfe 100644
--- a/src/math/Vector.h
+++ b/src/math/Vector.h
@@ -1,23 +1,22 @@
 #pragma once
 
-class CVector
+class CVector : public RwV3d
 {
 public:
-	float x, y, z;
 	CVector(void) {}
-	CVector(float x, float y, float z) : x(x), y(y), z(z) {}
-#ifdef RWCORE_H
-	CVector(const RwV3d &v) : x(v.x), y(v.y), z(v.z) {}
-
-	operator RwV3d (void) const {
-		RwV3d vecRw = { this->x, this->y, this->z };
-		return vecRw;
+	CVector(float x, float y, float z)
+	{
+		this->x = x;
+		this->y = y;
+		this->z = z;
 	}
-	
-	operator RwV3d *(void) {
-		return (RwV3d*)this;
+
+	CVector(const RwV3d &v)
+	{
+		x = v.x;
+		y = v.y;
+		z = v.z;
 	}
-#endif
 	// (0,1,0) means no rotation. So get right vector and its atan
 	float Heading(void) const { return Atan2(-x, y); }
 	float Magnitude(void) const { return Sqrt(x*x + y*y + z*z); }
-- 
cgit v1.2.3