sailors: cleanup

storm-devs · Jun 8, 2022 · bce742d · bce742d
1 parent 09aac3a
commit bce742d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/libs/sailors/src/sailors.cpp b/src/libs/sailors/src/sailors.cpp
@@ -760,7 +760,7 @@ void ShipWalk::DeleteMan(int Index)
     // UN//GUARD_SAILORS
 };
 //------------------------------------------------------------------------------------
-bool ShipWalk::Init(entid_t _shipID, int editorMode, const char *shipType, std::vector<std::string> &shipManModels)
+bool ShipWalk::Init(entid_t _shipID, int editorMode, const char *shipType, std::vector<std::string> &&shipManModels)
 {
     crewCount = 0;
     bHide = false;
@@ -806,7 +806,7 @@ bool ShipWalk::Init(entid_t _shipID, int editorMode, const char *shipType, std::
                 SetMastBroken(((iNumMasts - 1) - i) + 1); // ??? The masts are opposite ???
         }
 
-        if (std::size(shipManModels) > 0)
+        if (!shipManModels.empty())
         {
             shipManModels_ = std::move(shipManModels);
         }
@@ -1164,18 +1164,20 @@ uint64_t Sailors::ProcessMessage(MESSAGE &message)
 
             if (pvd != nullptr)
             {
-                const int nq = pvd->GetElementsNum();
-                const char *pstr;
+                const auto nq = pvd->GetElementsNum();
+                shipManModels.reserve(nq);
+
                 for (auto i = 0; i < nq; i++)
                 {
+                    const char *pstr;
                     pvd->Get(pstr, i);
                     shipManModels.push_back(pstr);
                 }
             }
         }
 
         shipWalk.emplace_back();
-        if (shipWalk[shipsCount].Init(shipID, editorMode, c.c_str(), shipManModels))
+        if (shipWalk[shipsCount].Init(shipID, editorMode, c.c_str(), std::move(shipManModels)))
         {
             shipsCount++;
 

diff --git a/src/libs/sailors/src/sailors.h b/src/libs/sailors/src/sailors.h
@@ -133,7 +133,7 @@ class ShipWalk
     void CreateNewMan(SailorsPoints &sailorsPoints);
     void DeleteMan(int Index);
 
-    bool Init(entid_t _shipID, int editorMode, const char *shipType, std::vector<std::string> &shipManModels);
+    bool Init(entid_t _shipID, int editorMode, const char *shipType, std::vector<std::string> &&shipManModels);
     void CheckPosition(uint32_t &dltTime);
     void SetMastBroken(int iMastIndex);
     void OnHullHit(const CVECTOR &v);