Removed ADDONS_MANAGER symbol completely.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8721 178a84e3-b1eb-0310-8ba1-8eac791a3b58

configure.ac

@@ -404,11 +404,6 @@ case "${host}" in
 esac
 ENETTREE="src/enet"
 
-# =================
-# Enable addons support (which is now on by default)
-# =================
-AC_DEFINE(ADDONS_MANAGER)
-
 # ==========================================
 # Check for a known compiler bug, details in 
 # src/bullet/src/Makefile.am

src/addons/network_http.cpp

@@ -288,9 +288,7 @@ CURLcode NetworkHttp::init()
             UserConfigParams::m_news_last_updated = Time::getTimeSinceEpoch();
         const XMLNode *xml = new XMLNode(xml_file);
         news_manager->init();
-#ifdef ADDONS_MANAGER
         status = loadAddonsList(xml, xml_file);
-#endif
         if(status==CURLE_OK)
             return status;
         else
@@ -316,14 +314,12 @@ CURLcode NetworkHttp::init()
     if(status==CURLE_ABORTED_BY_CALLBACK)
         return status;
 
-#ifdef ADDONS_MANAGER
     addons_manager->setErrorState();
     news_manager->setErrorMessage(error_message);
 
     if(UserConfigParams::logAddons())
         printf("[addons] %s\n", core::stringc(error_message).c_str());
     return status;
-#endif
 }   // init
 
 // ---------------------------------------------------------------------------
@@ -415,11 +411,9 @@ CURLcode NetworkHttp::loadAddonsList(const XMLNode *xml,
         if(download)
             UserConfigParams::m_addons_last_updated=Time::getTimeSinceEpoch();
         const XMLNode *xml = new XMLNode(xml_file);
-#ifdef ADDONS_MANAGER
         addons_manager->initOnline(xml);
         if(UserConfigParams::logAddons())
             printf("[addons] Addons manager list downloaded\n");
-#endif
         return status;
     }
 

src/graphics/irr_driver.cpp

@@ -416,9 +416,7 @@ void IrrDriver::applyResolutionSettings()
     
     file_manager->popTextureSearchPath();
 
-#ifdef ADDONS_MANAGER
     KartPropertiesManager::addKartSearchDir(file_manager->getAddonsFile("karts"));
-#endif
     kart_properties_manager -> loadAllKarts();
     
     attachment_manager      -> loadModels();

src/states_screens/addons_screen.cpp

@@ -15,8 +15,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef ADDONS_MANAGER
-
 #include "states_screens/addons_screen.hpp"
 
 #include <sstream>
@@ -212,5 +210,3 @@ void AddonsScreen::eventCallback(GUIEngine::Widget* widget,
 }   // eventCallback
 
 // ----------------------------------------------------------------------------
-
-#endif

src/states_screens/addons_screen.hpp

@@ -15,8 +15,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef ADDONS_MANAGER
-
 #ifndef HEADER_ADDONS_SCREEN_HPP
 #define HEADER_ADDONS_SCREEN_HPP\
 
@@ -77,4 +75,3 @@ public:
 };
 
 #endif
-#endif

src/states_screens/dialogs/addons_loading.cpp

@@ -16,8 +16,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#ifdef ADDONS_MANAGER
-
 #include "states_screens/dialogs/addons_loading.hpp"
 
 #include <pthread.h>
@@ -282,4 +280,3 @@ void AddonsLoading::doInstall()
         dismiss();
     }
 }   // doInstall
-#endif

src/states_screens/dialogs/addons_loading.hpp

@@ -16,8 +16,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#ifdef ADDONS_MANAGER
-
 #ifndef HEADER_ADDONS_LOADING_HPP
 #define HEADER_ADDONS_LOADING_HPP
 
@@ -75,4 +73,3 @@ public:
 };   // AddonsLoading
 
 #endif
-#endif

src/states_screens/main_menu_screen.cpp

@@ -69,11 +69,6 @@ void MainMenuScreen::loadedFromFile()
 {
     m_lang_popup = NULL;
     
-#ifndef ADDONS_MANAGER
-    RibbonWidget* r = this->getWidget<RibbonWidget>("menu_toprow");
-    if (r != NULL) r->deleteChild("addons");
-#endif
-    
     LabelWidget* w = this->getWidget<LabelWidget>("info_addons");
     w->setScrollSpeed(15);
 }
@@ -103,14 +98,12 @@ void MainMenuScreen::init()
     // the key bindings for the first player the default again.
     input_manager->getDeviceList()->clearLatestUsedDevice();
 
-#ifdef ADDONS_MANAGER
     if(!addons_manager->onlineReady() ||
         UserConfigParams::m_internet_status!=NetworkHttp::IPERM_ALLOWED )
     {
         IconButtonWidget* w = this->getWidget<IconButtonWidget>("addons");
         w->setDeactivated();
     }
-#endif
     
     LabelWidget* w = this->getWidget<LabelWidget>("info_addons");
     const core::stringw &news_text = news_manager->getNextNewsMessage();
@@ -121,7 +114,6 @@ void MainMenuScreen::init()
 // ------------------------------------------------------------------------------------------------------
 void MainMenuScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 {
-#ifdef ADDONS_MANAGER
     IconButtonWidget* addons_icon = this->getWidget<IconButtonWidget>("addons");
     if (addons_icon != NULL)
     {
@@ -132,8 +124,6 @@ void MainMenuScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
             addons_icon->setActivated();
     }
 
-#endif    
-
     LabelWidget* w = this->getWidget<LabelWidget>("info_addons");
     w->update(delta);
     if(w->scrolledOff())
@@ -397,13 +387,11 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
     {
         StateManager::get()->pushScreen(TutorialScreen::getInstance());
     }
-#ifdef ADDONS_MANAGER
     else if (selection == "addons")
     {
         std::cout << "Addons" << std::endl;
         StateManager::get()->pushScreen(AddonsScreen::getInstance());
     }
-#endif
 }
 
 // ------------------------------------------------------------------------------------------------------