[colobot] 215/390: Always show CBot documentation in SatCom, fixes #382
Didier Raboud
odyx at moszumanska.debian.org
Fri Jun 12 14:21:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 490e6fe2d6e2d6a848275ea2d0a87da4d361a3a8
Author: krzys-h <krzys_h at interia.pl>
Date: Tue Nov 11 17:22:21 2014 +0100
Always show CBot documentation in SatCom, fixes #382
---
src/ui/displayinfo.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp
index aceb5b0..1d6e4a3 100644
--- a/src/ui/displayinfo.cpp
+++ b/src/ui/displayinfo.cpp
@@ -684,7 +684,6 @@ void CDisplayInfo::UpdateIndexButton()
Ui::CEdit* edit;
Math::Point pos, dim;
char* filename;
- char* loading;
static int table[SATCOM_MAX] =
{
@@ -723,13 +722,12 @@ void CDisplayInfo::UpdateIndexButton()
//? button->SetState(STATE_VISIBLE, filename[0]!=0);
//? }
- loading = 0;
button = static_cast<Ui::CButton*>(pw->SearchControl(EVENT_SATCOM_LOADING));
if ( button != 0 )
{
button->SetState(STATE_CHECK, m_index==SATCOM_LOADING);
- loading = m_main->GetDisplayInfoName(SATCOM_LOADING);
- button->SetState(STATE_VISIBLE, loading[0]!=0);
+ filename = m_main->GetDisplayInfoName(SATCOM_LOADING);
+ button->SetState(STATE_VISIBLE, filename[0]!=0);
}
button = static_cast<Ui::CButton*>(pw->SearchControl(EVENT_SATCOM_PROG));
@@ -737,7 +735,7 @@ void CDisplayInfo::UpdateIndexButton()
{
button->SetState(STATE_CHECK, m_index==SATCOM_PROG);
filename = m_main->GetDisplayInfoName(SATCOM_PROG);
- button->SetState(STATE_VISIBLE, filename[0]!=0 && (m_index==SATCOM_LOADING||m_index==SATCOM_PROG||(loading!=0&&loading[0]==0)));
+ button->SetState(STATE_VISIBLE, filename[0]!=0);
}
button = static_cast<Ui::CButton*>(pw->SearchControl(EVENT_SATCOM_SOLUCE));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list