Post-merge fixes

src/graphics/engine/planet.cpp

@@ -105,7 +105,7 @@ void CPlanet::Draw()
 
     float dp = 0.5f/256.0f;
 
-    Math::IntPoint windowSize = m_engine->GetWindowSize();
+    auto windowSize = m_engine->GetWindowSize();
     float inverseAspectRatio = static_cast<float>(windowSize.y) / static_cast<float>(windowSize.x);
 
     for (const auto& planet : m_planets)

src/object/old_object.cpp

@@ -1729,7 +1729,7 @@ glm::vec3 COldObject::GetSlotPosition(int slotNum)
             break;
         case OBJECT_BEE:
             grabPartNum = 0;
-            grabRelPos = Math::Vector(0.0f, -3.0f, 0.0f);
+            grabRelPos = glm::vec3(0.0f, -3.0f, 0.0f);
             break;
         default: // unreachable, only the above objects have cargo slots
             assert(!m_hasCargoSlot);