diff options
| author | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
| commit | 2e136acd34c45e5e6d105cabf91c67e5865c38fe (patch) | |
| tree | 8561603160cce0b41ba31250539a22d37a2951de /src/ui/mainshort.cpp | |
| parent | 562be6fe765d7742f7c38fbd82f8cc26369e238b (diff) | |
| parent | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (diff) | |
| download | colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.gz colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.bz2 colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.zip | |
Merge tag 'colobot-gold-0.1.3-alpha' into debian
Diffstat (limited to 'src/ui/mainshort.cpp')
| -rw-r--r-- | src/ui/mainshort.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index d33482c..f6dce4b 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -97,7 +97,6 @@ bool CMainShort::CreateShortcuts() ObjectType type; Math::Point pos, dim; int i, rank, icon; - char name[100]; if ( m_main->GetFixScene() ) return false; @@ -208,10 +207,11 @@ bool CMainShort::CreateShortcuts() m_shortcuts[rank] = pObj; pc = m_interface->SearchControl(table_sc_em[rank]); - if ( pc != 0 ) + if ( pc != nullptr ) { - pObj->GetTooltipName(name); - pc->SetTooltip(name); + std::string tooltipName; + pObj->GetTooltipName(tooltipName); + pc->SetTooltip(tooltipName); } rank ++; |