immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make buildings inherit trainer param from builder

modernize-cmake-1
Fiftytwo 2020-03-31 19:02:53 +02:00
parent 0d6218bfa0
commit b5466261d4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/object/task/taskbuild.cpp
View File

@ -86,7 +86,7 @@ CTaskBuild::~CTaskBuild()
// Creates a building. // Creates a building.
void CTaskBuild::CreateBuilding(Math::Vector pos, float angle) void CTaskBuild::CreateBuilding(Math::Vector pos, float angle, bool trainer)
{ {
ObjectCreateParams params; ObjectCreateParams params;
params.pos = pos; params.pos = pos;
@ -94,6 +94,7 @@ void CTaskBuild::CreateBuilding(Math::Vector pos, float angle)
params.type = m_type; params.type = m_type;
params.power = 0.0f; params.power = 0.0f;
params.team = m_object->GetTeam(); params.team = m_object->GetTeam();
params.trainer = trainer;
m_building = CObjectManager::GetInstancePointer()->CreateObject(params); m_building = CObjectManager::GetInstancePointer()->CreateObject(params);
m_building->SetLock(true); // not yet usable m_building->SetLock(true); // not yet usable
@ -287,7 +288,7 @@ bool CTaskBuild::EventProcess(const Event &event)
pos = m_metal->GetPosition(); pos = m_metal->GetPosition();
a = m_object->GetRotationY(); a = m_object->GetRotationY();
CreateBuilding(pos, a+Math::PI); CreateBuilding(pos, a+Math::PI, m_object->GetTrainer());
CreateLight(); CreateLight();
} }

2
src/object/task/taskbuild.h
View File

@ -61,7 +61,7 @@ public:
protected: protected:
Error FlatFloor(); Error FlatFloor();
void CreateBuilding(Math::Vector pos, float angle); void CreateBuilding(Math::Vector pos, float angle, bool trainer);
void CreateLight(); void CreateLight();
void BlackLight(); void BlackLight();
CObject* SearchMetalObject(float &angle, float dMin, float dMax, float aLimit, Error &err); CObject* SearchMetalObject(float &angle, float dMin, float dMax, float aLimit, Error &err);