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

Removed SetCapacity()

master
krzys-h 2015-08-11 22:57:33 +02:00
parent 364f87c49b
commit 3f32b7c8a3
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/object/old_object.cpp
View File

@ -134,7 +134,6 @@ COldObject::COldObject(int id)
m_transporter = 0; m_transporter = 0;
m_transporterLink = 0; m_transporterLink = 0;
m_energy = 1.0f; m_energy = 1.0f;
m_capacity = 1.0f;
m_shield = 1.0f; m_shield = 1.0f;
m_range = 0.0f; m_range = 0.0f;
m_transparency = 0.0f; m_transparency = 0.0f;
@ -713,15 +712,6 @@ void COldObject::SetType(ObjectType type)
m_param = 1.0f; // shield up to default m_param = 1.0f; // shield up to default
} }
if ( m_type == OBJECT_ATOMIC )
{
m_capacity = 10.0f;
}
else
{
m_capacity = 1.0f;
}
if ( m_type == OBJECT_MOBILEwc || if ( m_type == OBJECT_MOBILEwc ||
m_type == OBJECT_MOBILEtc || m_type == OBJECT_MOBILEtc ||
m_type == OBJECT_MOBILEfc || m_type == OBJECT_MOBILEfc ||
@ -768,9 +758,6 @@ void COldObject::Write(CLevelParserLine* line)
if ( GetEnergyLevel() != 0.0f ) if ( GetEnergyLevel() != 0.0f )
line->AddParam("energy", MakeUnique<CLevelParserParam>(GetEnergyLevel())); line->AddParam("energy", MakeUnique<CLevelParserParam>(GetEnergyLevel()));
if ( GetCapacity() != 1.0f )
line->AddParam("capacity", MakeUnique<CLevelParserParam>(GetCapacity()));
if ( GetShield() != 1.0f ) if ( GetShield() != 1.0f )
line->AddParam("shield", MakeUnique<CLevelParserParam>(GetShield())); line->AddParam("shield", MakeUnique<CLevelParserParam>(GetShield()));
@ -874,7 +861,6 @@ void COldObject::Read(CLevelParserLine* line)
SetCameraDist(line->GetParam("cameraDist")->AsFloat(50.0f)); SetCameraDist(line->GetParam("cameraDist")->AsFloat(50.0f));
SetCameraLock(line->GetParam("cameraLock")->AsBool(false)); SetCameraLock(line->GetParam("cameraLock")->AsBool(false));
SetEnergyLevel(line->GetParam("energy")->AsFloat(0.0f)); SetEnergyLevel(line->GetParam("energy")->AsFloat(0.0f));
SetCapacity(line->GetParam("capacity")->AsFloat(1.0f));
SetShield(line->GetParam("shield")->AsFloat(1.0f)); SetShield(line->GetParam("shield")->AsFloat(1.0f));
SetRange(line->GetParam("range")->AsFloat(1.0f)); SetRange(line->GetParam("range")->AsFloat(1.0f));
SetSelectable(line->GetParam("selectable")->AsBool(true)); SetSelectable(line->GetParam("selectable")->AsBool(true));
@ -2332,19 +2318,9 @@ float COldObject::GetEnergyLevel()
return m_energy; return m_energy;
} }
// Management of the capacity of a battery.
// Single subject possesses a battery capacity,
// but not the vehicle that carries the battery!
void COldObject::SetCapacity(float capacity)
{
m_capacity = capacity;
}
float COldObject::GetCapacity() float COldObject::GetCapacity()
{ {
return m_capacity; return m_type == OBJECT_ATOMIC ? 10.0f : 1.0f;
} }
bool COldObject::IsRechargeable() bool COldObject::IsRechargeable()

2
src/object/old_object.h
View File

@ -101,7 +101,6 @@ protected:
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 SetShowLimitRadius(float radius);
void SetCapacity(float capacity);
void SetOption(int option); void SetOption(int option);
void SetJostlingSphere(const Math::Sphere& sphere); void SetJostlingSphere(const Math::Sphere& sphere);
@ -429,7 +428,6 @@ protected:
int m_transporterLink; // part int m_transporterLink; // part
float m_energy; // energy contained (if battery) float m_energy; // energy contained (if battery)
float m_lastEnergy; float m_lastEnergy;
float m_capacity; // capacity (if battery)
float m_shield; // shield float m_shield; // shield
float m_range; // flight range float m_range; // flight range
float m_transparency; // transparency (0..1) float m_transparency; // transparency (0..1)