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

Removed unused members of COldObject

dev-time-step
krzys-h 2016-02-21 15:16:30 +01:00
parent 63c7b83d82
commit dba944740f
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/object/motion/motionvehicle.cpp
View File

@ -913,12 +913,6 @@ void CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type,
type != OBJECT_MOBILEdr &&
type != OBJECT_APOLLO2)
{
color.r = 1.0f;
color.g = 1.0f;
color.b = 0.0f; // yellow
color.a = 0.0f;
m_object->CreateEffectLight(20.0f, color);
CObject* powerCell = nullptr;
Math::Vector powerCellPos = m_object->GetPowerPosition();
float powerCellAngle = 0.0f;

16
src/object/old_object.cpp
View File

@ -113,7 +113,6 @@ COldObject::COldObject(int id)
m_name = "";
m_shadowLight = -1;
m_shadowHeight = 0.0f;
m_effectHeight = 0.0f;
m_linVibration = Math::Vector(0.0f, 0.0f, 0.0f);
m_cirVibration = Math::Vector(0.0f, 0.0f, 0.0f);
m_tilt = Math::Vector(0.0f, 0.0f, 0.0f);
@ -124,7 +123,6 @@ COldObject::COldObject(int id)
m_transporterLink = 0;
m_shield = 1.0f;
m_range = 30.0f;
m_transparency = 0.0f;
m_lastEnergy = 999.9f;
m_bSelect = false;
m_bSelectable = true;
@ -138,7 +136,6 @@ COldObject::COldObject(int id)
m_bVirusMode = false;
m_virusTime = 0.0f;
m_lastVirusParticle = 0.0f;
m_bCargo = false;
m_dying = DeathType::Alive;
m_bFlat = false;
m_gunGoalV = 0.0f;
@ -1661,17 +1658,6 @@ int COldObject::GetShadowLight()
return m_shadowLight;
}
// Creates light for the effects of a vehicle.
bool COldObject::CreateEffectLight(float height, Gfx::Color color)
{
if ( !m_engine->GetLightMode() ) return true;
m_effectHeight = height;
return true;
}
// Creates the circular shadow underneath a vehicle.
bool COldObject::CreateShadowCircle(float radius, float intensity,
@ -2435,8 +2421,6 @@ void COldObject::SetTransparency(float value)
{
int i;
m_transparency = value;
for ( i=0 ; i<m_totalPart ; i++ )
{
if ( m_objectPart[i].bUsed )

5
src/object/old_object.h
View File

@ -261,7 +261,6 @@ public:
bool CreateShadowCircle(float radius, float intensity, Gfx::EngineShadowType type = Gfx::ENG_SHADOW_NORM);
bool CreateShadowLight(float height, Gfx::Color color);
bool CreateEffectLight(float height, Gfx::Color color);
void FlatParent() override;
@ -324,8 +323,6 @@ protected:
int m_option; // option
int m_shadowLight; // number of light from the shadows
float m_shadowHeight; // height of light from the shadows
int m_effectLight; // number of light effects
float m_effectHeight; // height of light effects
Math::Vector m_linVibration; // linear vibration
Math::Vector m_cirVibration; // circular vibration
Math::Vector m_tilt; // tilt
@ -337,7 +334,6 @@ protected:
float m_lastEnergy;
float m_shield; // shield
float m_range; // flight range
float m_transparency; // transparency (0..1)
float m_aTime;
float m_shotTime; // time since last shot
bool m_bVirusMode; // virus activated/triggered
@ -347,7 +343,6 @@ protected:
bool m_bSelectable; // selectable object
bool m_bCheckToken; // object with audited tokens
bool m_underground; // object active but undetectable
bool m_bCargo;
DeathType m_dying;
bool m_bFlat;
bool m_bTrainer; // drive vehicle (without remote)