diff options
Diffstat (limited to 'src/object/task')
-rw-r--r-- | src/object/task/taskbuild.cpp | 2 | ||||
-rw-r--r-- | src/object/task/taskfire.cpp | 2 | ||||
-rw-r--r-- | src/object/task/taskgoto.cpp | 14 | ||||
-rw-r--r-- | src/object/task/taskrecover.cpp | 2 | ||||
-rw-r--r-- | src/object/task/taskshield.cpp | 2 | ||||
-rw-r--r-- | src/object/task/taskterraform.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 25936f9..ecbf898 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -371,7 +371,7 @@ Error CTaskBuild::Start(ObjectType type) m_metal->SetLock(true); // not usable m_camera->StartCentering(m_object, Math::PI*0.15f, 99.9f, 0.0f, 1.0f); - + m_phase = TBP_TURN; // rotation necessary preliminary m_angleY = oAngle; // angle was reached diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 8d300e6..92c51da 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -316,7 +316,7 @@ Error CTaskFire::Start(float delay) else if ( m_bRay ) fire = m_delay*ENERGY_FIREr; else fire = m_delay*ENERGY_FIRE; if ( energy < fire/power->RetCapacity()+0.05f ) return ERR_FIRE_ENERGY; - + m_speed = 1.0f/m_delay; m_progress = 0.0f; m_time = 0.0f; diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index a3b1515..5fd6cbe 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -1441,7 +1441,7 @@ void CTaskGoto::ComputeRepulse(Math::Point &dir) if ( pObj == m_object ) continue; if ( pObj->RetTruck() != 0 ) continue; - + oPos = pObj->RetPosition(0); dist = Math::Distance(oPos, m_goalObject); if ( dist <= 1.0f ) continue; @@ -1601,7 +1601,7 @@ void CTaskGoto::ComputeRepulse(Math::Point &dir) { addi = 2.0f; // between wasps, do not annoy too much } - + j = 0; while ( pObj->GetCrashSphere(j++, oPos, oRadius) ) { @@ -1791,10 +1791,10 @@ Error CTaskGoto::BeamExplore(const Math::Vector &prevPos, const Math::Vector &cu Math::Vector newPos; Error ret; int iDiv, iClear, iLar; - + iLar = 0; if ( i >= MAXPOINTS ) return ERR_GOTO_ITER; // too many recursions - + if ( m_bmIter[i] == -1 ) { m_bmIter[i] = 0; @@ -1828,7 +1828,7 @@ Error CTaskGoto::BeamExplore(const Math::Vector &prevPos, const Math::Vector &cu } } } - + if ( iLar >= m_bmIter[i] ) { newPos = BeamPoint(curPos, goalPos, 0, step); @@ -2051,7 +2051,7 @@ void CTaskGoto::BitmapObject() if ( pObj == m_object ) continue; if ( pObj == m_bmFretObject ) continue; if ( pObj->RetTruck() != 0 ) continue; - + h = m_terrain->RetFloorLevel(pObj->RetPosition(0), false); if ( m_physics->RetType() == TYPE_FLYING && m_altitude > 0.0f ) { @@ -2177,7 +2177,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) { aLimit = 60.0f*Math::PI/180.0f; } - + for ( y=miny ; y<=maxy ; y++ ) { for ( x=minx ; x<=maxx ; x++ ) diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 8f603f7..02cefb8 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -189,7 +189,7 @@ Error CTaskRecover::Start() if ( power == 0 ) return ERR_RECOVER_ENERGY; energy = power->RetEnergy(); if ( energy < ENERGY_RECOVER/power->RetCapacity()+0.05f ) return ERR_RECOVER_ENERGY; - + mat = m_object->RetWorldMatrix(0); pos = Math::Vector(RECOVER_DIST, 3.3f, 0.0f); pos = Transform(*mat, pos); // position in front diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index d5265a2..aa62f7b 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -257,7 +257,7 @@ Error CTaskShield::Start(TaskShieldMode mode, float delay) if ( power == 0 ) return ERR_SHIELD_ENERGY; energy = power->RetEnergy(); if ( energy == 0.0f ) return ERR_SHIELD_ENERGY; - + mat = m_object->RetWorldMatrix(0); pos = Math::Vector(7.0f, 15.0f, 0.0f); pos = Transform(*mat, pos); // sphere position diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 94e3b75..3a16008 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -216,7 +216,7 @@ Error CTaskTerraform::Start() if ( power == 0 ) return ERR_TERRA_ENERGY; energy = power->RetEnergy(); if ( energy < ENERGY_TERRA/power->RetCapacity()+0.05f ) return ERR_TERRA_ENERGY; - + speed = m_physics->RetMotorSpeed(); if ( speed.x != 0.0f || speed.z != 0.0f ) return ERR_MANIP_MOTOR; |