The language selection popup shouldn't require add-ons to be enabled
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7521 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
52811d8752
commit
9c979bc753
@ -106,10 +106,10 @@ void MainMenuScreen::init()
|
||||
|
||||
}
|
||||
|
||||
#ifdef ADDONS_MANAGER
|
||||
// ------------------------------------------------------------------------------------------------------
|
||||
void MainMenuScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
|
||||
{
|
||||
#ifdef ADDONS_MANAGER
|
||||
IconButtonWidget* addons_icon = this->getWidget<IconButtonWidget>("addons");
|
||||
if (addons_icon != NULL)
|
||||
{
|
||||
@ -123,6 +123,8 @@ void MainMenuScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
|
||||
const std::string &news_text = network_http->getNewsMessage();
|
||||
w->setText(news_text.c_str());
|
||||
|
||||
#endif
|
||||
|
||||
IconButtonWidget* lang_combo = this->getWidget<IconButtonWidget>("lang_combo");
|
||||
if (lang_combo != NULL)
|
||||
{
|
||||
@ -150,7 +152,6 @@ void MainMenuScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
// ------------------------------------------------------------------------------------------------------
|
||||
|
||||
void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, const int playerID)
|
||||
|
@ -38,10 +38,7 @@ class MainMenuScreen : public GUIEngine::Screen, public GUIEngine::ScreenSinglet
|
||||
|
||||
public:
|
||||
|
||||
#ifdef ADDONS_MANAGER
|
||||
|
||||
virtual void onUpdate(float delta, irr::video::IVideoDriver* driver);
|
||||
#endif
|
||||
|
||||
/** \brief implement callback from parent class GUIEngine::Screen */
|
||||
virtual void loadedFromFile();
|
||||
|
Loading…
Reference in New Issue
Block a user