summaryrefslogtreecommitdiffstats
path: root/src/ui/scroll.cpp
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-18 22:33:28 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-18 22:33:28 +0200
commit36ae984ac77c5545d3d11dde7e37913a8eff0b0d (patch)
tree94a296b8b816c372b436c56fff8d75263cfe2d4a /src/ui/scroll.cpp
parenta397922e8d53c6f7ff469d38e5139fd003c705b5 (diff)
downloadcolobot-36ae984ac77c5545d3d11dde7e37913a8eff0b0d.tar.gz
colobot-36ae984ac77c5545d3d11dde7e37913a8eff0b0d.tar.bz2
colobot-36ae984ac77c5545d3d11dde7e37913a8eff0b0d.zip
Warnings cleaned, left only those connected to commented out code.
Diffstat (limited to 'src/ui/scroll.cpp')
-rw-r--r--src/ui/scroll.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp
index 21f8158..41240ca 100644
--- a/src/ui/scroll.cpp
+++ b/src/ui/scroll.cpp
@@ -99,7 +99,7 @@ void CScroll::MoveAdjust()
if ( m_buttonUp == 0 )
{
m_buttonUp = new CButton();
- pc = (CButton*)m_buttonUp;
+ pc = m_buttonUp;
pc->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), 49, EVENT_NULL);
pc->SetRepeat(true);
m_eventUp = pc->GetEventType();
@@ -108,7 +108,7 @@ void CScroll::MoveAdjust()
if ( m_buttonDown == 0 )
{
m_buttonDown = new CButton();
- pc = (CButton*)m_buttonDown;
+ pc = m_buttonDown;
pc->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), 50, EVENT_NULL);
pc->SetRepeat(true);
m_eventDown = pc->GetEventType();
@@ -345,7 +345,7 @@ void CScroll::Draw()
dim.y *= m_visibleRatio;
DrawVertex(pos, dim, 2);
- n = (int)(dim.y*0.8f/0.012f);
+ n = static_cast<int>(dim.y*0.8f/0.012f);
if ( n < 1 ) n = 1;
if ( n > 5 ) n = 5;