Fix setMarkerType not restoring position (fixes #2194)

Author: botder

Client/mods/deathmatch/logic/CClientMarker.cpp

@@ -180,27 +180,31 @@ void CClientMarker::SetMarkerType(CClientMarker::eMarkerType eType)
         {
             // Just change the type
             static_cast<CClientCheckpoint*>(m_pMarker)->SetCheckpointType(CClientCheckpoint::TYPE_RING);
+            return;
         }
 
         // Or current type is a ring and new type is a checkpoint?
         if (eCurrentType == MARKER_RING && eType == MARKER_CHECKPOINT)
         {
             // Just change the type
             static_cast<CClientCheckpoint*>(m_pMarker)->SetCheckpointType(CClientCheckpoint::TYPE_NORMAL);
+            return;
         }
 
         // Current type is a cylinder and new type is an arrow
         if (eCurrentType == MARKER_CYLINDER && eType == MARKER_ARROW)
         {
             // Just change the type
             static_cast<CClient3DMarker*>(m_pMarker)->Set3DMarkerType(CClient3DMarker::TYPE_ARROW);
+            return;
         }
 
         // Current type is an arrow and new type is an cylinder
         if (eCurrentType == MARKER_ARROW && eType == MARKER_CYLINDER)
         {
             // Just change the type
             static_cast<CClient3DMarker*>(m_pMarker)->Set3DMarkerType(CClient3DMarker::TYPE_CYLINDER);
+            return;
         }
 
         // No easy way of changing the type. Different classes. Remember position and color and recreate it.
@@ -218,6 +222,9 @@ void CClientMarker::SetMarkerType(CClientMarker::eMarkerType eType)
         // Create a new one of the correct type
         CreateOfType(eType);
 
+        // Reset stored position to re-apply last position (fixes issue #2194)
+        m_vecPosition = {};
+
         // Set the properties back
         SetPosition(vecPosition);
         SetSize(fSize);