mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-26 21:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert 0363202a20, 2abd9cead2 and b4144dc2c3

Browse Source 
Player-testing has revealed QA issues, so reverting these for now.

Differential Revision: https://code.wildfiregames.com/D2773
This was SVN commit r23714.
This commit is contained in:
wraitii
2020-05-31 10:06:39 +00:00
parent 0cde295654
commit 531dcf40c3
9 changed files with 39 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpObstruction.cpp
-5
View File
@@ -651,11 +651,6 @@ public:
return ret;
}
virtual std::vector<entity_id_t> GetEntitiesBlockingMovement() const
{
return GetEntitiesByFlags(ICmpObstructionManager::FLAG_BLOCK_MOVEMENT);
}
virtual std::vector<entity_id_t> GetEntitiesBlockingConstruction() const
{
return GetEntitiesByFlags(ICmpObstructionManager::FLAG_BLOCK_CONSTRUCTION);
source/simulation2/components/ICmpObstruction.cpp
-1
View File
@@ -50,7 +50,6 @@ DEFINE_INTERFACE_METHOD_CONST_0("GetUnitRadius", entity_pos_t, ICmpObstruction,
DEFINE_INTERFACE_METHOD_CONST_0("CheckShorePlacement", bool, ICmpObstruction, CheckShorePlacement)
DEFINE_INTERFACE_METHOD_CONST_2("CheckFoundation", std::string, ICmpObstruction, CheckFoundation_wrapper, std::string, bool)
DEFINE_INTERFACE_METHOD_CONST_0("CheckDuplicateFoundation", bool, ICmpObstruction, CheckDuplicateFoundation)
DEFINE_INTERFACE_METHOD_CONST_0("GetEntitiesBlockingMovement", std::vector<entity_id_t>, ICmpObstruction, GetEntitiesBlockingMovement)
DEFINE_INTERFACE_METHOD_CONST_0("GetEntitiesBlockingConstruction", std::vector<entity_id_t>, ICmpObstruction, GetEntitiesBlockingConstruction)
DEFINE_INTERFACE_METHOD_CONST_0("GetEntitiesDeletedUponConstruction", std::vector<entity_id_t>, ICmpObstruction, GetEntitiesDeletedUponConstruction)
DEFINE_INTERFACE_METHOD_1("SetActive", void, ICmpObstruction, SetActive, bool)
source/simulation2/components/ICmpObstruction.h
-6
View File
@@ -104,12 +104,6 @@ public:
*/
virtual std::vector<entity_id_t> GetEntitiesByFlags(ICmpObstructionManager::flags_t flags) const = 0;
/**
* Returns a list of entities that are blocking movement.
* @return vector of blocking entities
*/
virtual std::vector<entity_id_t> GetEntitiesBlockingMovement() const = 0;
/**
* Returns a list of entities that are blocking construction of a foundation.
* @return vector of blocking entities
source/simulation2/components/tests/test_ObstructionManager.h
-1
View File
@@ -41,7 +41,6 @@ public:
virtual std::string CheckFoundation_wrapper(const std::string& UNUSED(className), bool UNUSED(onlyCenterPoint)) const { return std::string(); }
virtual bool CheckDuplicateFoundation() const { return true; }
virtual std::vector<entity_id_t> GetEntitiesByFlags(ICmpObstructionManager::flags_t UNUSED(flags)) const { return std::vector<entity_id_t>(); }
virtual std::vector<entity_id_t> GetEntitiesBlockingMovement() const { return std::vector<entity_id_t>(); }
virtual std::vector<entity_id_t> GetEntitiesBlockingConstruction() const { return std::vector<entity_id_t>(); }
virtual std::vector<entity_id_t> GetEntitiesDeletedUponConstruction() const { return std::vector<entity_id_t>(); }
virtual void ResolveFoundationCollisions() const { }