Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix some C++-style notes from b5df81af76.

Browse Source 
/ b5df81af76

Differential revision: D3096
Reviewed by: @vladislavbelov, @wraitii
Comments by: @Angen, @Stan
This was SVN commit r24542.
This commit is contained in:
Freagarach 2021-01-11 11:26:31 +00:00
parent ebadfe260a
commit 1c505439f7
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/graphics/MapReader.cpp
View File

@ -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<entity_id_t> Garrison;
std::vector<std::pair<std::string, entity_id_t> > Turrets;
std::vector<std::pair<std::string, entity_id_t>> 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()
));
);
}
}
// <actor>
@ -1074,20 +1074,18 @@ int CXMLReader::ReadEntities(XMBElement parent, double end_time)
{
CmpPtr<ICmpGarrisonHolder> 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<ICmpTurretHolder> 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<ICmpObstruction> cmpObstruction(sim, ent);

4
source/graphics/MapWriter.cpp
View File

@ -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<ICmpTurretHolder> cmpTurretHolder(sim, ent);
if (cmpTurretHolder)
{
std::vector<std::pair<std::string, entity_id_t> > turrets = cmpTurretHolder->GetTurrets();
std::vector<std::pair<std::string, entity_id_t>> turrets = cmpTurretHolder->GetTurrets();
if (!turrets.empty())
{
XMLWriter_Element turretTag(xmlMapFile, "Turrets");

6
source/simulation2/components/ICmpGarrisonHolder.cpp
View File

@ -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<entity_id_t> GetEntities() const
{
return m_Script.Call<std::vector<entity_id_t> >("GetEntities");
return m_Script.Call<std::vector<entity_id_t>>("GetEntities");
}
virtual void SetInitEntities(std::vector<entity_id_t> entities)
virtual void SetInitEntities(std::vector<entity_id_t>&& entities)
{
m_Script.CallVoid("SetInitGarrison", entities);
}

4
source/simulation2/components/ICmpGarrisonHolder.h
View File

@ -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<entity_id_t> GetEntities() const = 0;
virtual void SetInitEntities(const std::vector<entity_id_t> entities) = 0;
virtual void SetInitEntities(std::vector<entity_id_t>&& entities) = 0;
DECLARE_INTERFACE_TYPE(GarrisonHolder)
};

6
source/simulation2/components/ICmpTurretHolder.cpp
View File

@ -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<std::pair<std::string, entity_id_t> > GetTurrets() const
{
std::vector<std::pair<std::string, entity_id_t> > turrets;
std::vector<entity_id_t> entities = m_Script.Call<std::vector<entity_id_t> >("GetEntities");
std::vector<entity_id_t> entities = m_Script.Call<std::vector<entity_id_t>>("GetEntities");
for (entity_id_t entity : entities)
turrets.push_back(std::make_pair(
m_Script.Call<std::string>("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<std::pair<std::string, entity_id_t> > entities)
virtual void SetInitEntities(std::vector<std::pair<std::string, entity_id_t>>&& entities)
{
for (const std::pair<std::string, entity_id_t>& p : entities)
m_Script.CallVoid("SetInitEntity", p.first, p.second);

6
source/simulation2/components/ICmpTurretHolder.h
View File

@ -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<std::pair<std::string, entity_id_t> > GetTurrets() const = 0;
virtual std::vector<std::pair<std::string, entity_id_t>> GetTurrets() const = 0;
/**
* Correlation between entities (ID) and the turret point they ought to occupy (name).
*/
virtual void SetInitEntities(const std::vector<std::pair<std::string, entity_id_t> > entities) = 0;
virtual void SetInitEntities(std::vector<std::pair<std::string, entity_id_t>>&& entities) = 0;
DECLARE_INTERFACE_TYPE(TurretHolder)
};