summaryrefslogtreecommitdiffstats
path: root/src/object/brain.cpp
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2013-03-31 10:22:08 +0200
committerkrzys-h <krzys_h@interia.pl>2013-03-31 10:22:08 +0200
commit0625f064a74ab70b06534b2198fa2b10f42fa183 (patch)
tree6f710509bcb841bf017775b650e596c81a3684ab /src/object/brain.cpp
parent90301e24c0fc5fcd6bffb0399e203e5adea6aa2c (diff)
parent5a60a7a21958e2d8cfd33148f575d36e3bbd9ebb (diff)
downloadcolobot-0625f064a74ab70b06534b2198fa2b10f42fa183.tar.gz
colobot-0625f064a74ab70b06534b2198fa2b10f42fa183.tar.bz2
colobot-0625f064a74ab70b06534b2198fa2b10f42fa183.zip
Merge branch 'dev' of github.com:colobot/colobot into dev
Diffstat (limited to 'src/object/brain.cpp')
-rw-r--r--src/object/brain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object/brain.cpp b/src/object/brain.cpp
index fa3e425..951a763 100644
--- a/src/object/brain.cpp
+++ b/src/object/brain.cpp
@@ -2056,7 +2056,7 @@ void CBrain::UpdateInterface(float rTime)
pc->SetState(Ui::STATE_VISIBLE, m_main->GetShowMap());
}
- pb = (Ui::CButton*)pw->SearchControl(EVENT_OBJECT_REC);
+ pb = static_cast<Ui::CButton*>(pw->SearchControl(EVENT_OBJECT_REC));
if ( pb != 0 )
{
if ( m_bTraceRecord && Math::Mod(m_time, 0.4f) >= 0.2f )