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

Add aim recalibration during falling

modernize-cmake-1
Fiftytwo 2017-11-29 13:24:05 +01:00
parent db23c6eecf
commit 7eb1df4119
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,9 +202,9 @@ void CTaskBuild::BlackLight()
bool CTaskBuild::EventProcess(const Event &event) bool CTaskBuild::EventProcess(const Event &event)
{ {
Math::Matrix* mat; Math::Matrix* mat;
Math::Vector pos, dir, speed; Math::Vector pos, dir, speed, pv, pm, tilt;
Math::Point dim; Math::Point dim;
float a, g, cirSpeed, dist, linSpeed; float a, g, cirSpeed, dist, linSpeed, diff;
if ( m_engine->GetPause() ) return true; if ( m_engine->GetPause() ) return true;
if ( event.type != EVENT_FRAME ) return true; if ( event.type != EVENT_FRAME ) return true;
@ -355,6 +355,16 @@ bool CTaskBuild::EventProcess(const Event &event)
m_sound->Play(SOUND_BUILD, m_object->GetPosition(), 0.5f, 1.0f*Math::Rand()*1.5f); m_sound->Play(SOUND_BUILD, m_object->GetPosition(), 0.5f, 1.0f*Math::Rand()*1.5f);
} }
} }
if(m_object->GetType() == OBJECT_MOBILEfb && m_object->GetReactorRange()<0.2f && m_phase != TBP_MOVE)
{
pv = m_object->GetPosition();
pm = m_metal->GetPosition();
dist = Math::Distance(pv, pm);
diff = pm.y - 8.0f - pv.y;
tilt = m_object->GetRotation();
m_object->StartTaskGunGoal(asin(diff/dist)-tilt.z, 0.0f);
}
return true; return true;
} }