From dbe127569bc1f7252280c1465c2c4e337c37d7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= <tomaszkax86@gmail.com>
Date: Mon, 3 Jan 2022 23:55:50 +0100
Subject: [PATCH] Refactored Math::Vector in control classes

---
 src/ui/controls/control.cpp | 4 ++--
 src/ui/controls/map.cpp     | 6 +++---
 src/ui/controls/target.cpp  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ui/controls/control.cpp b/src/ui/controls/control.cpp
index 476fd0a7..0e152b4d 100644
--- a/src/ui/controls/control.cpp
+++ b/src/ui/controls/control.cpp
@@ -412,7 +412,7 @@ void CControl::GlintCreate(const glm::vec2& ref, bool bLeft, bool bUp)
 
 void CControl::GlintFrame(const Event &event)
 {
-    Math::Vector    pos, speed;
+    glm::vec3    pos, speed;
     glm::vec2       dim;
 
     if ( (m_state & STATE_GLINT  ) == 0 ||
@@ -428,7 +428,7 @@ void CControl::GlintFrame(const Event &event)
         pos.x = m_glintCorner1.x + (m_glintCorner2.x - m_glintCorner1.x) * Math::Rand();
         pos.y = m_glintCorner1.y + (m_glintCorner2.y - m_glintCorner1.y) * Math::Rand();
         pos.z = 0.0f;
-        speed = Math::Vector(0.0f, 0.0f, 0.0f);
+        speed = glm::vec3(0.0f, 0.0f, 0.0f);
         dim.x = ((15.0f + Math::Rand() * 15.0f) / 640.0f);
         dim.y = dim.x / 0.75f;
         m_particle->CreateParticle(pos, speed, dim, Gfx::PARTICONTROL,
diff --git a/src/ui/controls/map.cpp b/src/ui/controls/map.cpp
index 490228a7..7bf06d29 100644
--- a/src/ui/controls/map.cpp
+++ b/src/ui/controls/map.cpp
@@ -1052,7 +1052,7 @@ void CMap::UpdateTerrain()
     {
         for (int x = 0; x < 256; x++)
         {
-            Math::Vector pos;
+            glm::vec3 pos{};
             pos.x =  (static_cast<float>(x) - 128.0f) * m_half / 128.0f;
             pos.z = -(static_cast<float>(y) - 128.0f) * m_half / 128.0f;
             pos.y = 0.0f;
@@ -1100,7 +1100,7 @@ void CMap::UpdateTerrain()
 void CMap::UpdateTerrain(int bx, int by, int ex, int ey)
 {
     Gfx::Color   color;
-    Math::Vector        pos;
+    glm::vec3        pos;
     float           scale, water, level, intensity;
     int             x, y;
 
@@ -1180,7 +1180,7 @@ void CMap::UpdateObject(CObject* pObj)
 {
     ObjectType      type;
     MapColor        color;
-    Math::Vector    pos;
+    glm::vec3    pos;
     glm::vec2       ppos;
     float           dir;
 
diff --git a/src/ui/controls/target.cpp b/src/ui/controls/target.cpp
index 1862d419..fe9cb4db 100644
--- a/src/ui/controls/target.cpp
+++ b/src/ui/controls/target.cpp
@@ -135,7 +135,7 @@ bool CTarget::GetTooltip(const glm::vec2& pos, std::string &name)
 
 CObject* CTarget::DetectFriendObject(const glm::vec2& pos)
 {
-    Math::Vector p;
+    glm::vec3 p;
     int objRank = m_engine->DetectObject(pos, p);
 
     for (CObject* obj : CObjectManager::GetInstancePointer()->GetAllObjects())