From 8b223eb0965a74693963726efb4e884ef454b97a Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Wed, 12 Sep 2012 22:34:40 +0200 Subject: all tasks compile. --- src/object/task/taskterraform.cpp | 90 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'src/object/task/taskterraform.cpp') diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 3a16008..6afece4 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -23,10 +23,10 @@ #include "math/geometry.h" #include "common/iman.h" -#include "old/particule.h" -#include "old/terrain.h" +#include "graphics/engine/pyro.h" +#include "graphics/engine/particle.h" +#include "graphics/engine/terrain.h" #include "physics/physics.h" -#include "old/pyro.h" #include "object/brain.h" #include "object/motion/motionant.h" #include "object/motion/motionspider.h" @@ -42,7 +42,7 @@ const float ACTION_RADIUS = 400.0f; CTaskTerraform::CTaskTerraform(CInstanceManager* iMan, CObject* object) : CTask(iMan, object) { - m_lastParticule = 0.0f; + m_lastParticle = 0.0f; m_soundChannel = -1; } @@ -63,8 +63,8 @@ bool CTaskTerraform::EventProcess(const Event &event) Math::Point dim; float energy; - if ( m_engine->RetPause() ) return true; - if ( event.event != EVENT_FRAME ) return true; + if ( m_engine->GetPause() ) return true; + if ( event.type != EVENT_FRAME ) return true; if ( m_bError ) return false; m_progress += event.rTime*m_speed; // others advance @@ -75,11 +75,11 @@ bool CTaskTerraform::EventProcess(const Event &event) if ( m_soundChannel == -1 ) { #if _TEEN - m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, true); + m_soundChannel = m_sound->Play(SOUND_GGG, m_object->GetPosition(0), 1.0f, 0.5f, true); m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.0f, 1.5f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP); #else - m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, true); + m_soundChannel = m_sound->Play(SOUND_GGG, m_object->GetPosition(0), 1.0f, 0.5f, true); m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.0f, 4.0f, SOPER_CONTINUE); m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP); #endif @@ -92,13 +92,13 @@ bool CTaskTerraform::EventProcess(const Event &event) m_object->SetZoom(0, 1.0f+m_progress*0.2f); - power = m_object->RetPower(); + power = m_object->GetPower(); if ( power != 0 ) { power->SetZoom(0, 1.0f+m_progress*1.0f); - energy = power->RetEnergy(); - energy -= event.rTime*ENERGY_TERRA/power->RetCapacity()/4.0f; + energy = power->GetEnergy(); + energy -= event.rTime*ENERGY_TERRA/power->GetCapacity()/4.0f; if ( energy < 0.0f ) energy = 0.0f; power->SetEnergy(energy); } @@ -131,18 +131,18 @@ bool CTaskTerraform::EventProcess(const Event &event) dir.x = 0.0f; dir.y = 0.0f; dir.z = 0.0f; - pos = m_object->RetPosition(2); + pos = m_object->GetPosition(2); if ( pos.y < 0.0f ) { dir.z = -atanf((pos.y/2.0f)/9.0f); } m_object->SetInclinaison(dir); - if ( m_time-m_lastParticule >= m_engine->ParticuleAdapt(0.05f) ) + if ( m_time-m_lastParticle >= m_engine->ParticleAdapt(0.05f) ) { - m_lastParticule = m_time; + m_lastParticle = m_time; - mat = m_object->RetWorldMatrix(0); + mat = m_object->GetWorldMatrix(0); if ( m_phase == TTP_CHARGE ) { @@ -156,7 +156,7 @@ bool CTaskTerraform::EventProcess(const Event &event) speed.y = 6.0f+Math::Rand()*4.0f*(1.0f+m_progress*2.0f); dim.x = 0.5f+1.5f*m_progress; dim.y = dim.x; - m_particule->CreateParticule(pos, speed, dim, PARTIBLITZ, 2.0f, 20.0f); + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTIBLITZ, 2.0f, 20.0f); } if ( m_phase != TTP_CHARGE ) @@ -170,10 +170,10 @@ bool CTaskTerraform::EventProcess(const Event &event) speed.z = Math::Rand()*2.0f; speed.y = 2.5f+Math::Rand()*1.0f; speed = Math::Transform(*mat, speed); - speed -= m_object->RetPosition(0); + speed -= m_object->GetPosition(0); dim.x = Math::Rand()*1.0f+1.0f; dim.y = dim.x; - m_particule->CreateParticule(pos, speed, dim, PARTISMOKE1, 3.0f); + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISMOKE1, 3.0f); // Right grid. pos = Math::Vector(-1.0f, 5.8f, -3.5f); @@ -184,10 +184,10 @@ bool CTaskTerraform::EventProcess(const Event &event) speed.z = -Math::Rand()*2.0f; speed.y = 2.5f+Math::Rand()*1.0f; speed = Math::Transform(*mat, speed); - speed -= m_object->RetPosition(0); + speed -= m_object->GetPosition(0); dim.x = Math::Rand()*1.0f+1.0f; dim.y = dim.x; - m_particule->CreateParticule(pos, speed, dim, PARTISMOKE1, 3.0f); + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISMOKE1, 3.0f); } } @@ -207,21 +207,21 @@ Error CTaskTerraform::Start() ObjectType type; m_bError = true; // operation impossible - if ( !m_physics->RetLand() ) return ERR_TERRA_VEH; + if ( !m_physics->GetLand() ) return ERR_TERRA_VEH; - type = m_object->RetType(); + type = m_object->GetType(); if ( type != OBJECT_MOBILErt ) return ERR_TERRA_VEH; - power = m_object->RetPower(); + power = m_object->GetPower(); if ( power == 0 ) return ERR_TERRA_ENERGY; - energy = power->RetEnergy(); - if ( energy < ENERGY_TERRA/power->RetCapacity()+0.05f ) return ERR_TERRA_ENERGY; + energy = power->GetEnergy(); + if ( energy < ENERGY_TERRA/power->GetCapacity()+0.05f ) return ERR_TERRA_ENERGY; - speed = m_physics->RetMotorSpeed(); + speed = m_physics->GetMotorSpeed(); if ( speed.x != 0.0f || speed.z != 0.0f ) return ERR_MANIP_MOTOR; - mat = m_object->RetWorldMatrix(0); + mat = m_object->GetWorldMatrix(0); pos = Math::Vector(9.0f, 0.0f, 0.0f); pos = Math::Transform(*mat, pos); // battery position m_terraPos = pos; @@ -251,7 +251,7 @@ Error CTaskTerraform::IsEnded() float dist, duration; int i, max; - if ( m_engine->RetPause() ) return ERR_CONTINUE; + if ( m_engine->GetPause() ) return ERR_CONTINUE; if ( m_bError ) return ERR_STOP; if ( m_progress < 1.0f ) return ERR_CONTINUE; @@ -277,24 +277,24 @@ Error CTaskTerraform::IsEnded() m_object->SetCirVibration(Math::Vector(0.0f, 0.0f, 0.0f)); m_object->SetZoom(0, 1.0f); - power = m_object->RetPower(); + power = m_object->GetPower(); if ( power != 0 ) { power->SetZoom(0, 1.0f); } - max= (int)(50.0f*m_engine->RetParticuleDensity()); + max= static_cast(50.0f*m_engine->GetParticleDensity()); for ( i=0 ; iMoveOnFloor(pos); + m_terrain->AdjustToFloor(pos); dist = Math::Distance(pos, m_terraPos); speed = Math::Vector(0.0f, 0.0f, 0.0f); dim.x = 2.0f+(40.0f-dist)/(1.0f+Math::Rand()*4.0f); dim.y = dim.x; - m_particule->CreateParticule(pos, speed, dim, PARTICRASH, 2.0f); + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTICRASH, 2.0f); pos = m_terraPos; speed.x = (Math::Rand()-0.5f)*40.0f; @@ -304,7 +304,7 @@ Error CTaskTerraform::IsEnded() dim.y = dim.x; pos.y += dim.y; duration = Math::Rand()*3.0f+3.0f; - m_particule->CreateTrack(pos, speed, dim, PARTITRACK5, + m_particle->CreateTrack(pos, speed, dim, Gfx::PARTITRACK5, duration, Math::Rand()*10.0f+15.0f, duration*0.2f, 1.0f); } @@ -343,7 +343,7 @@ bool CTaskTerraform::Abort() m_object->SetCirVibration(Math::Vector(0.0f, 0.0f, 0.0f)); m_object->SetZoom(0, 1.0f); - power = m_object->RetPower(); + power = m_object->GetPower(); if ( power != 0 ) { power->SetZoom(0, 1.0f); @@ -361,49 +361,49 @@ bool CTaskTerraform::Terraform() CObject* pObj; CBrain* brain; CMotion* motion; - CPyro* pyro; + Gfx::CPyro* pyro; ObjectType type; float dist; int i; - m_camera->StartEffect(CE_TERRAFORM, m_terraPos, 1.0f); + m_camera->StartEffect(Gfx::CAM_EFFECT_TERRAFORM, m_terraPos, 1.0f); m_sound->Play(SOUND_THUMP, m_terraPos); for ( i=0 ; i<1000000 ; i++ ) { - pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); + pObj = static_cast(m_iMan->SearchInstance(CLASS_OBJECT, i)); if ( pObj == 0 ) break; - type = pObj->RetType(); + type = pObj->GetType(); if ( type == OBJECT_NULL ) continue; if ( type == OBJECT_TEEN34 ) // stone? { - dist = Math::Distance(m_terraPos, pObj->RetPosition(0)); + dist = Math::Distance(m_terraPos, pObj->GetPosition(0)); if ( dist > 20.0f ) continue; - pyro = new CPyro(m_iMan); - pyro->Create(PT_FRAGT, pObj); + pyro = new Gfx::CPyro(m_iMan); + pyro->Create(Gfx::PT_FRAGT, pObj); } else { - motion = pObj->RetMotion(); + motion = pObj->GetMotion(); if ( motion == 0 ) continue; - dist = Math::Distance(m_terraPos, pObj->RetPosition(0)); + dist = Math::Distance(m_terraPos, pObj->GetPosition(0)); if ( dist > ACTION_RADIUS ) continue; if ( type == OBJECT_ANT ) { - brain = pObj->RetBrain(); + brain = pObj->GetBrain(); if ( brain != 0 ) brain->StopTask(); motion->SetAction(MAS_BACK1, 0.8f+Math::Rand()*0.3f); pObj->SetFixed(true); // not moving } if ( type == OBJECT_SPIDER ) { - brain = pObj->RetBrain(); + brain = pObj->GetBrain(); if ( brain != 0 ) brain->StopTask(); motion->SetAction(MSS_BACK1, 0.8f+Math::Rand()*0.3f); pObj->SetFixed(true); // not moving -- cgit v1.2.3-1-g7c22