mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually remove trailing whitespace for non-header files as well.

Browse Source 
This was SVN commit r18989.
This commit is contained in:
elexis
2016-11-23 13:02:58 +00:00
parent 944ba16eb4
commit 6149dd3841
389 changed files with 1460 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpObstruction.cpp
+7 -7
View File
@@ -91,7 +91,7 @@ public:
* Optional secondary control group identifier. Similar to m_ControlGroup; if set to a valid value,
* then this field identifies an additional, secondary control group to which this entity's shape
* belongs. Set to INVALID_ENTITY to not assign any secondary group. Defaults to INVALID_ENTITY.
*
*
* These are only necessary in case it is not sufficient for an entity to belong to only one control
* group. Otherwise, they can be ignored.
*/
@@ -396,7 +396,7 @@ public:
else if (m_Type == UNIT)
m_Tag = cmpObstructionManager->AddUnitShape(GetEntityId(),
pos.X, pos.Y, m_Clearance, (flags_t)(m_Flags | (m_Moving ? ICmpObstructionManager::FLAG_MOVING : 0)), m_ControlGroup);
else
else
AddClusterShapes(pos.X, pos.Y, cmpPosition->GetRotation().Y);
}
else if (!active && m_Active)
@@ -554,7 +554,7 @@ public:
pass_class_t passClass = cmpPathfinder->GetPassabilityClass(className);
// Ignore collisions within the same control group, or with other non-foundation-blocking shapes.
// Note that, since the control group for each entity defaults to the entity's ID, this is typically
// Note that, since the control group for each entity defaults to the entity's ID, this is typically
// equivalent to only ignoring the entity's own shape and other non-foundation-blocking shapes.
SkipControlGroupsRequireFlagObstructionFilter filter(m_ControlGroup, m_ControlGroup2,
ICmpObstructionManager::FLAG_BLOCK_FOUNDATION);
@@ -595,7 +595,7 @@ public:
return !cmpObstructionManager->TestUnitShape(filter, pos.X, pos.Y, m_Clearance, NULL);
else
return !cmpObstructionManager->TestStaticShape(filter, pos.X, pos.Y, cmpPosition->GetRotation().Y, m_Size0, m_Size1, NULL );
}
}
virtual std::vector<entity_id_t> GetUnitCollisions()
{
@@ -648,12 +648,12 @@ public:
UpdateControlGroups();
}
virtual entity_id_t GetControlGroup()
virtual entity_id_t GetControlGroup()
{
return m_ControlGroup;
}
virtual entity_id_t GetControlGroup2()
virtual entity_id_t GetControlGroup2()
{
return m_ControlGroup2;
}
@@ -704,7 +704,7 @@ public:
CFixedVector2D pos = cmpPosition->GetPosition2D();
// Ignore collisions within the same control group, or with other non-foundation-blocking shapes.
// Note that, since the control group for each entity defaults to the entity's ID, this is typically
// Note that, since the control group for each entity defaults to the entity's ID, this is typically
// equivalent to only ignoring the entity's own shape and other non-foundation-blocking shapes.
SkipControlGroupsRequireFlagObstructionFilter filter(m_ControlGroup, m_ControlGroup2,
ICmpObstructionManager::FLAG_BLOCK_FOUNDATION);