diff options
| author | erihel <erihel@gmail.com> | 2012-08-21 21:38:13 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-08-21 21:38:13 +0200 |
| commit | 5408fe92527a4df01e4d66a2cdfdbbbea5738afc (patch) | |
| tree | 8bb78b55d837bc8c16db2357fcd898fe3c7880fd /src/ui/mainmap.cpp | |
| parent | 4faa1b9c447485cd2086a4c7f7c3655042e5de83 (diff) | |
| download | colobot-5408fe92527a4df01e4d66a2cdfdbbbea5738afc.tar.gz colobot-5408fe92527a4df01e4d66a2cdfdbbbea5738afc.tar.bz2 colobot-5408fe92527a4df01e4d66a2cdfdbbbea5738afc.zip | |
* added nullptr
* changed Ret to Get function names
* minor changes
Diffstat (limited to 'src/ui/mainmap.cpp')
| -rw-r--r-- | src/ui/mainmap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index 02453a4..e874fba 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -177,7 +177,7 @@ void CMainMap::DimMap() ps->SetPos(pos); ps->SetDim(dim); - value = pm->RetZoom(); + value = pm->GetZoom(); value = (value-ZOOM_MIN) / (ZOOM_MAX-ZOOM_MIN); value = powf(value, 0.5f); ps->SetVisibleValue(value); @@ -256,7 +256,8 @@ void CMainMap::ZoomMap() if (ps == nullptr) return; - zoom = ps->SetVisibleValue(); + + zoom = ps->GetVisibleValue(); zoom = powf(zoom, 2.0f); zoom = ZOOM_MIN+zoom*(ZOOM_MAX - ZOOM_MIN); pm->SetZoom(zoom); |