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

Removed SetShowLimitRadius

master
krzys-h 2015-08-12 17:48:58 +02:00
parent 60797f72d3
commit 15bf98da40
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/object/object_factory.cpp
View File

@ -485,7 +485,6 @@ CObjectUPtr CObjectFactory::CreateBuilding(const ObjectCreateParams& params)
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 45.0f, 0.0f), 10.0f)); obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 45.0f, 0.0f), 10.0f));
obj->CreateShadowCircle(60.0f, 1.0f); obj->CreateShadowCircle(60.0f, 1.0f);
obj->SetShowLimitRadius(200.0f);
m_terrain->AddBuildingLevel(pos, 28.6f, 73.4f, 30.0f, 0.4f); m_terrain->AddBuildingLevel(pos, 28.6f, 73.4f, 30.0f, 0.4f);
} }
@ -852,7 +851,6 @@ CObjectUPtr CObjectFactory::CreateBuilding(const ObjectCreateParams& params)
obj->GetCharacter()->posPower = Math::Vector(5.0f, 3.0f, 0.0f); obj->GetCharacter()->posPower = Math::Vector(5.0f, 3.0f, 0.0f);
obj->CreateShadowCircle(6.0f, 1.0f); obj->CreateShadowCircle(6.0f, 1.0f);
obj->SetShowLimitRadius(Gfx::LTNG_PROTECTION_RADIUS);
} }
if ( type == OBJECT_NUCLEAR ) if ( type == OBJECT_NUCLEAR )
@ -902,7 +900,6 @@ CObjectUPtr CObjectFactory::CreateBuilding(const ObjectCreateParams& params)
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 20.0f)); obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 20.0f));
obj->CreateShadowCircle(21.0f, 1.0f); obj->CreateShadowCircle(21.0f, 1.0f);
obj->SetShowLimitRadius(Gfx::LTNG_PROTECTION_RADIUS);
} }
if ( type == OBJECT_SAFE ) if ( type == OBJECT_SAFE )
@ -2572,13 +2569,6 @@ CObjectUPtr CObjectFactory::CreateVehicle(const ObjectCreateParams& params)
obj->SetToy(toy); obj->SetToy(toy);
float showLimitRadius = 0.0f;
if ( type == OBJECT_MOBILErt ) // robot thumper?
{
showLimitRadius = 400.0f;
}
obj->SetShowLimitRadius(showLimitRadius);
auto physics = MakeUnique<CPhysics>(obj.get()); auto physics = MakeUnique<CPhysics>(obj.get());
std::unique_ptr<CMotion> motion; std::unique_ptr<CMotion> motion;

12
src/object/old_object.cpp
View File

@ -126,7 +126,6 @@ COldObject::COldObject(int id)
m_bToy = false; m_bToy = false;
m_bManual = false; m_bManual = false;
m_bFixed = false; m_bFixed = false;
m_showLimitRadius = 0.0f;
m_aTime = 0.0f; m_aTime = 0.0f;
m_shotTime = 0.0f; m_shotTime = 0.0f;
m_bVirusMode = false; m_bVirusMode = false;
@ -2585,14 +2584,13 @@ float COldObject::GetGunGoalH()
return m_gunGoalH; return m_gunGoalH;
} }
void COldObject::SetShowLimitRadius(float radius)
{
m_showLimitRadius = radius;
}
float COldObject::GetShowLimitRadius() float COldObject::GetShowLimitRadius()
{ {
return m_showLimitRadius; if ( m_type == OBJECT_BASE ) return 200.0f; // SpaceShip
if ( m_type == OBJECT_MOBILErt ) return 400.0f; // Thumper
if ( m_type == OBJECT_TOWER ) return Gfx::LTNG_PROTECTION_RADIUS; // DefenseTower
if ( m_type == OBJECT_PARA ) return Gfx::LTNG_PROTECTION_RADIUS; // PowerCaptor
return 0.0f;
} }

12
src/object/old_object.h
View File

@ -89,7 +89,6 @@ protected:
void SetProgrammable(bool programmable); void SetProgrammable(bool programmable);
void SetMotion(std::unique_ptr<CMotion> motion); void SetMotion(std::unique_ptr<CMotion> motion);
void SetAuto(std::unique_ptr<CAuto> automat); void SetAuto(std::unique_ptr<CAuto> automat);
void SetShowLimitRadius(float radius);
void SetOption(int option); void SetOption(int option);
void SetJostlingSphere(const Math::Sphere& sphere); void SetJostlingSphere(const Math::Sphere& sphere);
@ -368,8 +367,6 @@ protected:
bool m_bToy; // toy key bool m_bToy; // toy key
bool m_bManual; // manual control (Scribbler) bool m_bManual; // manual control (Scribbler)
bool m_bFixed; bool m_bFixed;
bool m_bClip;
float m_showLimitRadius;
float m_gunGoalV; float m_gunGoalV;
float m_gunGoalH; float m_gunGoalH;
Gfx::CameraType m_cameraType; Gfx::CameraType m_cameraType;
@ -378,7 +375,6 @@ protected:
int m_defRank; int m_defRank;
float m_magnifyDamage; float m_magnifyDamage;
float m_param; float m_param;
int m_team;
Math::Sphere m_jostlingSphere; Math::Sphere m_jostlingSphere;
float m_shieldRadius; float m_shieldRadius;
@ -388,10 +384,10 @@ protected:
int m_partiSel[4]; int m_partiSel[4];
float m_infoReturn; float m_infoReturn;
EventType m_buttonAxe; EventType m_buttonAxe;
float m_time; float m_time;
float m_burnTime; float m_burnTime;
}; };