From 1c505439f707fd575bd75dc4c88458e9839c37ed Mon Sep 17 00:00:00 2001 From: Freagarach Date: Mon, 11 Jan 2021 11:26:31 +0000 Subject: [PATCH] Fix some C++-style notes from b5df81af76. / b5df81af76 Differential revision: D3096 Reviewed by: @vladislavbelov, @wraitii Comments by: @Angen, @Stan This was SVN commit r24542. --- source/graphics/MapReader.cpp | 14 ++++++-------- source/graphics/MapWriter.cpp | 4 ++-- .../simulation2/components/ICmpGarrisonHolder.cpp | 6 +++--- source/simulation2/components/ICmpGarrisonHolder.h | 4 ++-- source/simulation2/components/ICmpTurretHolder.cpp | 6 +++--- source/simulation2/components/ICmpTurretHolder.h | 6 +++--- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp index 6e9595509b..8941877563 100644 --- a/source/graphics/MapReader.cpp +++ b/source/graphics/MapReader.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -961,7 +961,7 @@ int CXMLReader::ReadEntities(XMBElement parent, double end_time) CStrW TemplateName; int PlayerID = 0; std::vector Garrison; - std::vector > Turrets; + std::vector> Turrets; CFixedVector3D Position; CFixedVector3D Orientation; long Seed = -1; @@ -1029,10 +1029,10 @@ int CXMLReader::ReadEntities(XMBElement parent, double end_time) for (const XMBElement& turretPoint : turrets) { XMBAttributeList turretAttrs = turretPoint.GetAttributes(); - Turrets.push_back(std::make_pair( + Turrets.emplace_back( turretAttrs.GetNamedItem(at_turret), turretAttrs.GetNamedItem(at_uid).ToInt() - )); + ); } } // @@ -1074,20 +1074,18 @@ int CXMLReader::ReadEntities(XMBElement parent, double end_time) { CmpPtr cmpGarrisonHolder(sim, ent); if (cmpGarrisonHolder) - cmpGarrisonHolder->SetInitEntities(Garrison); + cmpGarrisonHolder->SetInitEntities(std::move(Garrison)); else LOGERROR("CXMLMapReader::ReadEntities() entity '%d' of player '%d' has no GarrisonHolder component and thus cannot garrison units.", ent, PlayerID); - Garrison.clear(); } if (!Turrets.empty()) { CmpPtr cmpTurretHolder(sim, ent); if (cmpTurretHolder) - cmpTurretHolder->SetInitEntities(Turrets); + cmpTurretHolder->SetInitEntities(std::move(Turrets)); else LOGERROR("CXMLMapReader::ReadEntities() entity '%d' of player '%d' has no TurretHolder component and thus cannot use turrets.", ent, PlayerID); - Turrets.clear(); } CmpPtr cmpObstruction(sim, ent); diff --git a/source/graphics/MapWriter.cpp b/source/graphics/MapWriter.cpp index 4c04d80aee..fbc0612ad1 100644 --- a/source/graphics/MapWriter.cpp +++ b/source/graphics/MapWriter.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -361,7 +361,7 @@ void CMapWriter::WriteXML(const VfsPath& filename, CmpPtr cmpTurretHolder(sim, ent); if (cmpTurretHolder) { - std::vector > turrets = cmpTurretHolder->GetTurrets(); + std::vector> turrets = cmpTurretHolder->GetTurrets(); if (!turrets.empty()) { XMLWriter_Element turretTag(xmlMapFile, "Turrets"); diff --git a/source/simulation2/components/ICmpGarrisonHolder.cpp b/source/simulation2/components/ICmpGarrisonHolder.cpp index de3cbc1117..40613c4628 100644 --- a/source/simulation2/components/ICmpGarrisonHolder.cpp +++ b/source/simulation2/components/ICmpGarrisonHolder.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -32,10 +32,10 @@ public: virtual std::vector GetEntities() const { - return m_Script.Call >("GetEntities"); + return m_Script.Call>("GetEntities"); } - virtual void SetInitEntities(std::vector entities) + virtual void SetInitEntities(std::vector&& entities) { m_Script.CallVoid("SetInitGarrison", entities); } diff --git a/source/simulation2/components/ICmpGarrisonHolder.h b/source/simulation2/components/ICmpGarrisonHolder.h index b89908f717..a81a3b2548 100644 --- a/source/simulation2/components/ICmpGarrisonHolder.h +++ b/source/simulation2/components/ICmpGarrisonHolder.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class ICmpGarrisonHolder : public IComponent public: virtual std::vector GetEntities() const = 0; - virtual void SetInitEntities(const std::vector entities) = 0; + virtual void SetInitEntities(std::vector&& entities) = 0; DECLARE_INTERFACE_TYPE(GarrisonHolder) }; diff --git a/source/simulation2/components/ICmpTurretHolder.cpp b/source/simulation2/components/ICmpTurretHolder.cpp index b5261e9155..e203806ecd 100644 --- a/source/simulation2/components/ICmpTurretHolder.cpp +++ b/source/simulation2/components/ICmpTurretHolder.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ public: virtual std::vector > GetTurrets() const { std::vector > turrets; - std::vector entities = m_Script.Call >("GetEntities"); + std::vector entities = m_Script.Call>("GetEntities"); for (entity_id_t entity : entities) turrets.push_back(std::make_pair( m_Script.Call("GetOccupiedTurretName", entity), @@ -50,7 +50,7 @@ public: /** * Correlation between entities (ID) and the turret point they ought to occupy (name). */ - virtual void SetInitEntities(std::vector > entities) + virtual void SetInitEntities(std::vector>&& entities) { for (const std::pair& p : entities) m_Script.CallVoid("SetInitEntity", p.first, p.second); diff --git a/source/simulation2/components/ICmpTurretHolder.h b/source/simulation2/components/ICmpTurretHolder.h index 61bc7ddb96..2b4a3d1c04 100644 --- a/source/simulation2/components/ICmpTurretHolder.h +++ b/source/simulation2/components/ICmpTurretHolder.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -29,12 +29,12 @@ public: * Returns the correlation between garrisoned turrets (their ID) and which * turret point they occupy (name). */ - virtual std::vector > GetTurrets() const = 0; + virtual std::vector> GetTurrets() const = 0; /** * Correlation between entities (ID) and the turret point they ought to occupy (name). */ - virtual void SetInitEntities(const std::vector > entities) = 0; + virtual void SetInitEntities(std::vector>&& entities) = 0; DECLARE_INTERFACE_TYPE(TurretHolder) };