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

Removed some unused CBrain members

master
krzys-h 2015-08-10 11:24:02 +02:00
parent 2f156f022e
commit 39a4a4cd78
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/object/brain.cpp
View File

@ -92,10 +92,6 @@ CBrain::CBrain(COldObject* object)
m_time = 0.0f; m_time = 0.0f;
m_burnTime = 0.0f; m_burnTime = 0.0f;
m_lastUpdateTime = 0.0f; m_lastUpdateTime = 0.0f;
m_lastHumanTime = 0.0f;
m_lastWormTime = 0.0f;
m_antTarget = 0;
m_beeBullet = 0;
m_lastAlarmTime = 0.0f; m_lastAlarmTime = 0.0f;
m_soundChannelAlarm = -1; m_soundChannelAlarm = -1;
m_flagColor = 0; m_flagColor = 0;
@ -143,15 +139,6 @@ void CBrain::DeleteObject(bool all)
m_soundChannelAlarm = -1; m_soundChannelAlarm = -1;
} }
if ( !all )
{
if ( m_beeBullet != nullptr )
{
CObjectManager::GetInstancePointer()->DeleteObject(m_beeBullet);
m_beeBullet = nullptr;
}
}
if ( m_studio != 0 ) // current edition? if ( m_studio != 0 ) // current edition?
{ {
StopEditScript(true); StopEditScript(true);

9
src/object/brain.h
View File

@ -225,19 +225,10 @@ protected:
EventType m_buttonAxe; EventType m_buttonAxe;
EventType m_manipStyle; EventType m_manipStyle;
EventType m_defaultEnter; EventType m_defaultEnter;
EventType m_interfaceEvent[100];
CObject* m_antTarget;
CObject* m_beeBullet;
float m_beeBulletSpeed;
Math::Vector m_startPos;
float m_time; float m_time;
float m_burnTime; float m_burnTime;
float m_lastUpdateTime; float m_lastUpdateTime;
float m_lastHumanTime;
float m_lastSpiderTime;
float m_lastWormTime;
float m_lastBulletTime;
float m_lastAlarmTime; float m_lastAlarmTime;
int m_soundChannelAlarm; int m_soundChannelAlarm;
int m_flagColor; int m_flagColor;