From 5474b5528f2c6cffe5b519ab4da1931025718070 Mon Sep 17 00:00:00 2001 From: hiker Date: Wed, 22 Jan 2014 07:43:17 +1100 Subject: [PATCH] Removed unnecessary parameter from onUpdate calls. --- src/guiengine/engine.cpp | 2 +- src/guiengine/screen.hpp | 2 +- src/states_screens/addons_screen.cpp | 2 +- src/states_screens/addons_screen.hpp | 2 +- src/states_screens/create_server_screen.cpp | 2 +- src/states_screens/create_server_screen.hpp | 2 +- src/states_screens/credits.cpp | 2 +- src/states_screens/credits.hpp | 2 +- src/states_screens/feature_unlocked.cpp | 5 +-- src/states_screens/feature_unlocked.hpp | 2 +- src/states_screens/grand_prix_lose.cpp | 2 +- src/states_screens/grand_prix_lose.hpp | 2 +- src/states_screens/grand_prix_win.cpp | 2 +- src/states_screens/grand_prix_win.hpp | 2 +- src/states_screens/kart_selection.cpp | 2 +- src/states_screens/kart_selection.hpp | 2 +- src/states_screens/login_screen.cpp | 2 +- src/states_screens/login_screen.hpp | 2 +- src/states_screens/main_menu_screen.cpp | 2 +- src/states_screens/main_menu_screen.hpp | 2 +- src/states_screens/networking_lobby.cpp | 2 +- src/states_screens/networking_lobby.hpp | 2 +- .../online_profile_achievements.cpp | 2 +- .../online_profile_achievements.hpp | 2 +- src/states_screens/online_profile_friends.cpp | 2 +- src/states_screens/online_profile_friends.hpp | 2 +- src/states_screens/online_screen.cpp | 2 +- src/states_screens/online_screen.hpp | 2 +- src/states_screens/online_user_search.cpp | 2 +- src/states_screens/online_user_search.hpp | 2 +- src/states_screens/options_screen_input.cpp | 4 +- src/states_screens/options_screen_input.hpp | 2 +- src/states_screens/race_result_gui.cpp | 2 +- src/states_screens/race_result_gui.hpp | 2 +- src/states_screens/register_screen.cpp | 2 +- src/states_screens/register_screen.hpp | 2 +- src/states_screens/server_selection.cpp | 2 +- src/states_screens/server_selection.hpp | 2 +- src/states_screens/soccer_setup_screen.cpp | 41 +++++++++++-------- src/states_screens/soccer_setup_screen.hpp | 2 +- 40 files changed, 64 insertions(+), 60 deletions(-) diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp index c3d28f6ed..a094016e8 100644 --- a/src/guiengine/engine.cpp +++ b/src/guiengine/engine.cpp @@ -1195,7 +1195,7 @@ namespace GUIEngine if (ModalDialog::isADialogActive()) ModalDialog::getCurrent()->onUpdate(dt); else - getCurrentScreen()->onUpdate(elapsed_time, g_driver); + getCurrentScreen()->onUpdate(elapsed_time); } else { diff --git a/src/guiengine/screen.hpp b/src/guiengine/screen.hpp index f9552ae74..951626a08 100644 --- a/src/guiengine/screen.hpp +++ b/src/guiengine/screen.hpp @@ -260,7 +260,7 @@ namespace GUIEngine /** * \brief optional callback you can override to be notified at every frame. */ - virtual void onUpdate(float dt, irr::video::IVideoDriver*) { }; + virtual void onUpdate(float dt) { }; /** * \return which music to play at this screen diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp index 298bcde72..7e9db4ada 100644 --- a/src/states_screens/addons_screen.cpp +++ b/src/states_screens/addons_screen.cpp @@ -497,7 +497,7 @@ void AddonsScreen::setLastSelected() // ---------------------------------------------------------------------------- -void AddonsScreen::onUpdate(float dt, irr::video::IVideoDriver*) +void AddonsScreen::onUpdate(float dt) { if (m_reloading) { diff --git a/src/states_screens/addons_screen.hpp b/src/states_screens/addons_screen.hpp index b59ac1946..460543aa5 100644 --- a/src/states_screens/addons_screen.hpp +++ b/src/states_screens/addons_screen.hpp @@ -107,7 +107,7 @@ public: virtual void tearDown() OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; void setLastSelected(); diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp index f7f50205f..a2edf6a9c 100644 --- a/src/states_screens/create_server_screen.cpp +++ b/src/states_screens/create_server_screen.cpp @@ -90,7 +90,7 @@ void CreateServerScreen::init() m_info_widget->setText("", false); } // ---------------------------------------------------------------------------- -void CreateServerScreen::onUpdate(float delta, irr::video::IVideoDriver* driver) +void CreateServerScreen::onUpdate(float delta) { if(m_server_creation_request != NULL) { diff --git a/src/states_screens/create_server_screen.hpp b/src/states_screens/create_server_screen.hpp index 1a7c23292..3491c2e2a 100644 --- a/src/states_screens/create_server_screen.hpp +++ b/src/states_screens/create_server_screen.hpp @@ -55,7 +55,7 @@ private: public: - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE; diff --git a/src/states_screens/credits.cpp b/src/states_screens/credits.cpp index e6c7467c9..4927175d9 100644 --- a/src/states_screens/credits.cpp +++ b/src/states_screens/credits.cpp @@ -273,7 +273,7 @@ void CreditsScreen::reset() // ---------------------------------------------------------------------------- -void CreditsScreen::onUpdate(float elapsed_time, irr::video::IVideoDriver*) +void CreditsScreen::onUpdate(float elapsed_time) { // multiply by 0.8 to slow it down a bit as a whole time_before_next_step -= elapsed_time*0.8f; diff --git a/src/states_screens/credits.hpp b/src/states_screens/credits.hpp index 7d4e66c57..237ffdf6e 100644 --- a/src/states_screens/credits.hpp +++ b/src/states_screens/credits.hpp @@ -73,7 +73,7 @@ public: /** \brief implement optional callback from parent class * GUIEngine::Screen */ - void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + void onUpdate(float dt) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ void init() OVERRIDE; diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp index b8568111e..988840ec0 100644 --- a/src/states_screens/feature_unlocked.cpp +++ b/src/states_screens/feature_unlocked.cpp @@ -430,8 +430,7 @@ const float ANIM_TO = 3.0f; const int GIFT_EXIT_FROM = (int)ANIM_TO; const int GIFT_EXIT_TO = GIFT_EXIT_FROM + 7; -void FeatureUnlockedCutScene::onUpdate(float dt, - irr::video::IVideoDriver* driver) +void FeatureUnlockedCutScene::onUpdate(float dt) { m_global_time += dt; @@ -667,7 +666,7 @@ void FeatureUnlockedCutScene::continueButtonPressed() while (m_global_time < GIFT_EXIT_TO) { // simulate all the steps of the animation until we reach the end - onUpdate(0.4f, irr_driver->getVideoDriver()); + onUpdate(0.4f); } } else diff --git a/src/states_screens/feature_unlocked.hpp b/src/states_screens/feature_unlocked.hpp index 867825442..1e1ca56cf 100644 --- a/src/states_screens/feature_unlocked.hpp +++ b/src/states_screens/feature_unlocked.hpp @@ -126,7 +126,7 @@ class FeatureUnlockedCutScene : public GUIEngine::Screen, public GUIEngine::Scre public: /** \brief implement optional callback from parent class GUIEngine::Screen */ - void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + void onUpdate(float dt) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE; diff --git a/src/states_screens/grand_prix_lose.cpp b/src/states_screens/grand_prix_lose.cpp index 0645131e0..6dd6ba284 100644 --- a/src/states_screens/grand_prix_lose.cpp +++ b/src/states_screens/grand_prix_lose.cpp @@ -199,7 +199,7 @@ void GrandPrixLose::tearDown() // ------------------------------------------------------------------------------------- -void GrandPrixLose::onUpdate(float dt, irr::video::IVideoDriver* driver) +void GrandPrixLose::onUpdate(float dt) { m_global_time += dt; diff --git a/src/states_screens/grand_prix_lose.hpp b/src/states_screens/grand_prix_lose.hpp index 7395e5ea0..37f276464 100644 --- a/src/states_screens/grand_prix_lose.hpp +++ b/src/states_screens/grand_prix_lose.hpp @@ -75,7 +75,7 @@ public: virtual void loadedFromFile() OVERRIDE; /** \brief implement optional callback from parent class GUIEngine::Screen */ - void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + void onUpdate(float dt) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ void init() OVERRIDE; diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp index e5fdf4cb4..99c7f09d9 100644 --- a/src/states_screens/grand_prix_win.cpp +++ b/src/states_screens/grand_prix_win.cpp @@ -269,7 +269,7 @@ void GrandPrixWin::tearDown() // ------------------------------------------------------------------------------------- -void GrandPrixWin::onUpdate(float dt, irr::video::IVideoDriver* driver) +void GrandPrixWin::onUpdate(float dt) { m_global_time += dt; diff --git a/src/states_screens/grand_prix_win.hpp b/src/states_screens/grand_prix_win.hpp index 8a5ca7e0c..4892304e8 100644 --- a/src/states_screens/grand_prix_win.hpp +++ b/src/states_screens/grand_prix_win.hpp @@ -76,7 +76,7 @@ public: virtual void loadedFromFile() OVERRIDE; /** \brief implement optional callback from parent class GUIEngine::Screen */ - void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + void onUpdate(float dt) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ void init() OVERRIDE; diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp index 869a86f56..255f33ee0 100644 --- a/src/states_screens/kart_selection.cpp +++ b/src/states_screens/kart_selection.cpp @@ -1324,7 +1324,7 @@ bool KartSelectionScreen::playerQuit(StateManager::ActivePlayer* player) // ---------------------------------------------------------------------------- -void KartSelectionScreen::onUpdate(float delta, irr::video::IVideoDriver*) +void KartSelectionScreen::onUpdate(float delta) { // Dispatch the onUpdate event to each kart, so they can perform their // animation if any diff --git a/src/states_screens/kart_selection.hpp b/src/states_screens/kart_selection.hpp index 557b612fd..5c31f0a35 100644 --- a/src/states_screens/kart_selection.hpp +++ b/src/states_screens/kart_selection.hpp @@ -149,7 +149,7 @@ public: const int playerID) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; /** \brief implement optional callback from parent * class GUIEngine::Screen */ diff --git a/src/states_screens/login_screen.cpp b/src/states_screens/login_screen.cpp index 48998265c..4858d9222 100644 --- a/src/states_screens/login_screen.cpp +++ b/src/states_screens/login_screen.cpp @@ -126,7 +126,7 @@ void LoginScreen::loginError(const irr::core::stringw & error_message) /** Called in each frame. If a successful login is detected, the online screen * will be displayed. */ -void LoginScreen::onUpdate(float dt, irr::video::IVideoDriver*) +void LoginScreen::onUpdate(float dt) { if(!m_options_widget->isActivated()) diff --git a/src/states_screens/login_screen.hpp b/src/states_screens/login_screen.hpp index 19b0cf51a..57e25969c 100644 --- a/src/states_screens/login_screen.hpp +++ b/src/states_screens/login_screen.hpp @@ -48,7 +48,7 @@ public: /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE {}; virtual void init() OVERRIDE; - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp index 36145ea7b..fe6f3dfb3 100644 --- a/src/states_screens/main_menu_screen.cpp +++ b/src/states_screens/main_menu_screen.cpp @@ -140,7 +140,7 @@ void MainMenuScreen::init() } // init // ---------------------------------------------------------------------------- -void MainMenuScreen::onUpdate(float delta, irr::video::IVideoDriver* driver) +void MainMenuScreen::onUpdate(float delta) { IconButtonWidget* addons_icon = getWidget("addons"); if (addons_icon != NULL) diff --git a/src/states_screens/main_menu_screen.hpp b/src/states_screens/main_menu_screen.hpp index 5683c7923..20c474c7e 100644 --- a/src/states_screens/main_menu_screen.hpp +++ b/src/states_screens/main_menu_screen.hpp @@ -35,7 +35,7 @@ private: public: - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE; diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp index f2cc525d1..3f04b57dd 100644 --- a/src/states_screens/networking_lobby.cpp +++ b/src/states_screens/networking_lobby.cpp @@ -92,7 +92,7 @@ void NetworkingLobby::init() } // init // ---------------------------------------------------------------------------- -void NetworkingLobby::onUpdate(float delta, irr::video::IVideoDriver* driver) +void NetworkingLobby::onUpdate(float delta) { } // onUpdate diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/networking_lobby.hpp index 96f89b37b..d864fd27d 100644 --- a/src/states_screens/networking_lobby.hpp +++ b/src/states_screens/networking_lobby.hpp @@ -54,7 +54,7 @@ private: public: - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE; diff --git a/src/states_screens/online_profile_achievements.cpp b/src/states_screens/online_profile_achievements.cpp index 984800d06..1c849f9f8 100644 --- a/src/states_screens/online_profile_achievements.cpp +++ b/src/states_screens/online_profile_achievements.cpp @@ -112,7 +112,7 @@ void OnlineProfileAchievements::eventCallback(Widget* widget, const std::string& } // eventCallback // ---------------------------------------------------------------------------- -void OnlineProfileAchievements::onUpdate(float delta, irr::video::IVideoDriver* driver) +void OnlineProfileAchievements::onUpdate(float delta) { if(m_waiting_for_achievements) { diff --git a/src/states_screens/online_profile_achievements.hpp b/src/states_screens/online_profile_achievements.hpp index 2d2de6bb0..03a54b643 100644 --- a/src/states_screens/online_profile_achievements.hpp +++ b/src/states_screens/online_profile_achievements.hpp @@ -57,7 +57,7 @@ public: /** \brief implement callback from parent class GUIEngine::Screen */ virtual void init() OVERRIDE; - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; virtual void beforeAddingWidget() OVERRIDE; diff --git a/src/states_screens/online_profile_friends.cpp b/src/states_screens/online_profile_friends.cpp index ec2db51c8..eea34c60f 100644 --- a/src/states_screens/online_profile_friends.cpp +++ b/src/states_screens/online_profile_friends.cpp @@ -105,7 +105,7 @@ void OnlineProfileFriends::eventCallback(Widget* widget, const std::string& name } // eventCallback // ---------------------------------------------------------------------------- -void OnlineProfileFriends::onUpdate(float delta, irr::video::IVideoDriver* driver) +void OnlineProfileFriends::onUpdate(float delta) { if(m_waiting_for_friends) { diff --git a/src/states_screens/online_profile_friends.hpp b/src/states_screens/online_profile_friends.hpp index 0c74e2833..7416ae68e 100644 --- a/src/states_screens/online_profile_friends.hpp +++ b/src/states_screens/online_profile_friends.hpp @@ -59,7 +59,7 @@ public: /** \brief implement callback from parent class GUIEngine::Screen */ virtual void init() OVERRIDE; - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; virtual void beforeAddingWidget() OVERRIDE; diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp index 4cf458ffb..09dbee59d 100644 --- a/src/states_screens/online_screen.cpp +++ b/src/states_screens/online_screen.cpp @@ -140,7 +140,7 @@ void OnlineScreen::init() } // init // ---------------------------------------------------------------------------- -void OnlineScreen::onUpdate(float delta, irr::video::IVideoDriver* driver) +void OnlineScreen::onUpdate(float delta) { if (hasStateChanged()) { diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp index 24833b671..55395fed2 100644 --- a/src/states_screens/online_screen.hpp +++ b/src/states_screens/online_screen.hpp @@ -63,7 +63,7 @@ private: public: - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE; diff --git a/src/states_screens/online_user_search.cpp b/src/states_screens/online_user_search.cpp index 809748282..4cc6a9c57 100644 --- a/src/states_screens/online_user_search.cpp +++ b/src/states_screens/online_user_search.cpp @@ -174,7 +174,7 @@ void OnlineUserSearch::setLastSelected() //FIXME actually use this here and in s // ---------------------------------------------------------------------------- -void OnlineUserSearch::onUpdate(float dt, irr::video::IVideoDriver*) +void OnlineUserSearch::onUpdate(float dt) { if(m_search_request != NULL) { diff --git a/src/states_screens/online_user_search.hpp b/src/states_screens/online_user_search.hpp index 263c8a694..220be8b0f 100644 --- a/src/states_screens/online_user_search.hpp +++ b/src/states_screens/online_user_search.hpp @@ -75,7 +75,7 @@ public: virtual void tearDown() OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; void setLastSelected(); void setSearchString(const irr::core::stringw & search_string) {m_search_string = search_string;} diff --git a/src/states_screens/options_screen_input.cpp b/src/states_screens/options_screen_input.cpp index b8438f6bc..e81a65ce6 100644 --- a/src/states_screens/options_screen_input.cpp +++ b/src/states_screens/options_screen_input.cpp @@ -297,7 +297,7 @@ void OptionsScreenInput::filterInput(Input::InputType type, // ----------------------------------------------------------------------------- -void OptionsScreenInput::onUpdate(float dt, irr::video::IVideoDriver* drv) +void OptionsScreenInput::onUpdate(float dt) { std::map::iterator it; for (it = m_highlights.begin(); it != m_highlights.end();) @@ -318,4 +318,4 @@ void OptionsScreenInput::onUpdate(float dt, irr::video::IVideoDriver* drv) } } //m_highlights[internal_name] -} +} // onUpdate diff --git a/src/states_screens/options_screen_input.hpp b/src/states_screens/options_screen_input.hpp index 25e9a7e9b..02fcfc598 100644 --- a/src/states_screens/options_screen_input.hpp +++ b/src/states_screens/options_screen_input.hpp @@ -74,7 +74,7 @@ public: int value); /** \brief implement callback from parent class GUIEngine::Screen */ - virtual void onUpdate(float dt, irr::video::IVideoDriver* drv); + virtual void onUpdate(float dt); }; #endif diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp index 0a51182c8..f0306bff2 100644 --- a/src/states_screens/race_result_gui.cpp +++ b/src/states_screens/race_result_gui.cpp @@ -540,7 +540,7 @@ GUIEngine::EventPropagation RaceResultGUI::filterActions(PlayerAction action, /** Called once a frame, this now triggers the rendering of the actual * race result gui. */ -void RaceResultGUI::onUpdate(float dt, irr::video::IVideoDriver*) +void RaceResultGUI::onUpdate(float dt) { renderGlobal(dt); diff --git a/src/states_screens/race_result_gui.hpp b/src/states_screens/race_result_gui.hpp index 0a75fdef1..685800122 100644 --- a/src/states_screens/race_result_gui.hpp +++ b/src/states_screens/race_result_gui.hpp @@ -224,7 +224,7 @@ public: /** No kart specific view needs to be rendered in the result gui. */ virtual void renderPlayerView(const AbstractKart *kart) {} - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; /** No more messages need to be displayed, but the function might still be * called (e.g. 'new lap' message if the end controller is used for more diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp index dd27967df..50ec29dbc 100644 --- a/src/states_screens/register_screen.cpp +++ b/src/states_screens/register_screen.cpp @@ -126,7 +126,7 @@ void RegisterScreen::acceptTerms() // ----------------------------------------------------------------------------- -void RegisterScreen::onUpdate(float dt, irr::video::IVideoDriver*) +void RegisterScreen::onUpdate(float dt) { if(m_signup_request) { diff --git a/src/states_screens/register_screen.hpp b/src/states_screens/register_screen.hpp index ebf48d02f..01362bb84 100644 --- a/src/states_screens/register_screen.hpp +++ b/src/states_screens/register_screen.hpp @@ -52,7 +52,7 @@ public: /** \brief implement callback from parent class GUIEngine::Screen */ virtual void loadedFromFile() OVERRIDE {}; - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; void acceptTerms(); /** \brief implement callback from parent class GUIEngine::Screen */ diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp index 11ce8d06a..3b3260a88 100644 --- a/src/states_screens/server_selection.cpp +++ b/src/states_screens/server_selection.cpp @@ -185,7 +185,7 @@ void ServerSelection::setLastSelected() // ---------------------------------------------------------------------------- -void ServerSelection::onUpdate(float dt, irr::video::IVideoDriver*) +void ServerSelection::onUpdate(float dt) { if(m_refresh_request != NULL) { diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp index 724f48792..aecd29992 100644 --- a/src/states_screens/server_selection.hpp +++ b/src/states_screens/server_selection.hpp @@ -77,7 +77,7 @@ public: virtual void tearDown() OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ - virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE; + virtual void onUpdate(float dt) OVERRIDE; void setLastSelected(); diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp index 20f2b61b1..424595327 100644 --- a/src/states_screens/soccer_setup_screen.cpp +++ b/src/states_screens/soccer_setup_screen.cpp @@ -51,8 +51,9 @@ void SoccerSetupScreen::loadedFromFile() { } -// ----------------------------------------------------------------------------- -void SoccerSetupScreen::eventCallback(Widget* widget, const std::string& name, const int playerID) +// ---------------------------------------------------------------------------- +void SoccerSetupScreen::eventCallback(Widget* widget, const std::string& name, + const int playerID) { if(m_schedule_continue) return; @@ -118,7 +119,7 @@ void SoccerSetupScreen::eventCallback(Widget* widget, const std::string& name, c getWidget("goalamount")->setActivated(); } } -} +} // eventCallback // ----------------------------------------------------------------------------- void SoccerSetupScreen::beforeAddingWidget() @@ -187,7 +188,7 @@ void SoccerSetupScreen::beforeAddingWidget() // Update layout updateKartViewsLayout(); -} +} // beforeAddingWidget // ----------------------------------------------------------------------------- void SoccerSetupScreen::init() @@ -224,7 +225,7 @@ void SoccerSetupScreen::init() // 'fire' is not assigned to a GUI event). This is done to support the old // way of player joining by pressing 'fire' instead of 'select'. input_manager->getDeviceList()->mapFireToSelect(true); -} +} // init // ----------------------------------------------------------------------------- void SoccerSetupScreen::tearDown() @@ -247,14 +248,14 @@ void SoccerSetupScreen::tearDown() m_kart_view_info.clear(); Screen::tearDown(); -} +} // tearDown // ----------------------------------------------------------------------------- -GUIEngine::EventPropagation SoccerSetupScreen::filterActions( PlayerAction action, - int deviceID, - const unsigned int value, - Input::InputType type, - int playerId) +GUIEngine::EventPropagation SoccerSetupScreen::filterActions(PlayerAction action, + int deviceID, + const unsigned int value, + Input::InputType type, + int playerId) { if(m_schedule_continue) return EVENT_BLOCK; @@ -366,11 +367,10 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions( PlayerAction acti return result; -} - +} // filterActions // ----------------------------------------------------------------------------- -void SoccerSetupScreen::onUpdate(float delta, irr::video::IVideoDriver* driver) +void SoccerSetupScreen::onUpdate(float delta) { int nb_players = m_kart_view_info.size(); @@ -384,8 +384,9 @@ void SoccerSetupScreen::onUpdate(float delta, irr::video::IVideoDriver* driver) m_schedule_continue = false; StateManager::get()->pushScreen( ArenasScreen::getInstance() ); } -} +} // onUPdate +// ---------------------------------------------------------------------------- bool SoccerSetupScreen::areAllKartsConfirmed() const { bool all_confirmed = true; @@ -399,8 +400,9 @@ bool SoccerSetupScreen::areAllKartsConfirmed() const } } return all_confirmed; -} +} // areAllKartsConfirmed +// ---------------------------------------------------------------------------- int SoccerSetupScreen::getNumKartsInTeam(int team) { int karts_in_team = 0; @@ -411,8 +413,9 @@ int SoccerSetupScreen::getNumKartsInTeam(int team) karts_in_team++; } return karts_in_team; -} +} // getNumKartsInTeam +// ----------------------------------------------------------------------------- int SoccerSetupScreen::getNumConfirmedKarts() { int confirmed_karts = 0; @@ -425,6 +428,7 @@ int SoccerSetupScreen::getNumConfirmedKarts() return confirmed_karts; } +// ----------------------------------------------------------------------------- void SoccerSetupScreen::updateKartViewsLayout() { Widget* central_div = getWidget("central_div"); @@ -476,4 +480,5 @@ void SoccerSetupScreen::updateKartViewsLayout() // Move the view view_info.view->move(pos_x, pos_y, kart_view_size, kart_view_size); } -} +} // updateKartViewsLayout + diff --git a/src/states_screens/soccer_setup_screen.hpp b/src/states_screens/soccer_setup_screen.hpp index 6f6e3fb2a..c8fe50a9f 100644 --- a/src/states_screens/soccer_setup_screen.hpp +++ b/src/states_screens/soccer_setup_screen.hpp @@ -65,7 +65,7 @@ public: /** \brief implement callback from parent class GUIEngine::Screen */ virtual void tearDown() OVERRIDE; - virtual void onUpdate(float delta, irr::video::IVideoDriver* driver) OVERRIDE; + virtual void onUpdate(float delta) OVERRIDE; /** \brief implement callback from parent class GUIEngine::Screen */ virtual GUIEngine::EventPropagation filterActions( PlayerAction action,