From 137a7e671f493ed344cd6958c0a77989b1d76b1a Mon Sep 17 00:00:00 2001 From: Alayan Date: Sun, 16 Sep 2018 23:55:40 +0200 Subject: [PATCH] Move online screns to their own folders to reduce clutter --- src/main.cpp | 4 ++-- src/network/network_config.cpp | 8 ++++---- src/network/protocols/client_lobby.cpp | 6 +++--- src/network/protocols/connect_to_server.cpp | 2 +- src/network/protocols/server_lobby.cpp | 2 +- src/online/online_player_profile.cpp | 2 +- src/states_screens/dialogs/registration_dialog.cpp | 2 +- src/states_screens/dialogs/server_info_dialog.cpp | 2 +- .../dialogs/splitscreen_player_dialog.cpp | 2 +- src/states_screens/dialogs/user_info_dialog.cpp | 4 ++-- src/states_screens/ghost_replay_selection.cpp | 2 +- src/states_screens/gp_info_screen.cpp | 2 +- src/states_screens/main_menu_screen.cpp | 6 +++--- .../{ => online}/create_server_screen.cpp | 4 ++-- .../{ => online}/create_server_screen.hpp | 0 .../{ => online}/network_kart_selection.cpp | 4 ++-- .../{ => online}/network_kart_selection.hpp | 0 src/states_screens/{ => online}/networking_lobby.cpp | 2 +- src/states_screens/{ => online}/networking_lobby.hpp | 0 src/states_screens/{ => online}/online_lan.cpp | 8 ++++---- src/states_screens/{ => online}/online_lan.hpp | 2 +- .../{ => online}/online_profile_achievements.cpp | 2 +- .../{ => online}/online_profile_achievements.hpp | 2 +- .../{ => online}/online_profile_base.cpp | 10 +++++----- .../{ => online}/online_profile_base.hpp | 0 .../{ => online}/online_profile_friends.cpp | 4 ++-- .../{ => online}/online_profile_friends.hpp | 2 +- .../{ => online}/online_profile_servers.cpp | 8 ++++---- .../{ => online}/online_profile_servers.hpp | 2 +- .../{ => online}/online_profile_settings.cpp | 2 +- .../{ => online}/online_profile_settings.hpp | 2 +- src/states_screens/{ => online}/online_screen.cpp | 10 +++++----- src/states_screens/{ => online}/online_screen.hpp | 0 src/states_screens/{ => online}/online_user_search.cpp | 2 +- src/states_screens/{ => online}/online_user_search.hpp | 0 src/states_screens/{ => online}/register_screen.cpp | 2 +- src/states_screens/{ => online}/register_screen.hpp | 0 src/states_screens/{ => online}/server_selection.cpp | 2 +- src/states_screens/{ => online}/server_selection.hpp | 0 src/states_screens/{ => online}/tracks_screen.cpp | 2 +- src/states_screens/{ => online}/tracks_screen.hpp | 0 src/states_screens/options/user_screen.cpp | 2 +- src/states_screens/race_result_gui.cpp | 2 +- src/states_screens/track_info_screen.cpp | 2 +- 44 files changed, 61 insertions(+), 61 deletions(-) rename src/states_screens/{ => online}/create_server_screen.cpp (99%) rename src/states_screens/{ => online}/create_server_screen.hpp (100%) rename src/states_screens/{ => online}/network_kart_selection.cpp (97%) rename src/states_screens/{ => online}/network_kart_selection.hpp (100%) rename src/states_screens/{ => online}/networking_lobby.cpp (99%) rename src/states_screens/{ => online}/networking_lobby.hpp (100%) rename src/states_screens/{ => online}/online_lan.cpp (93%) rename src/states_screens/{ => online}/online_lan.hpp (97%) rename src/states_screens/{ => online}/online_profile_achievements.cpp (99%) rename src/states_screens/{ => online}/online_profile_achievements.hpp (98%) rename src/states_screens/{ => online}/online_profile_base.cpp (94%) rename src/states_screens/{ => online}/online_profile_base.hpp (100%) rename src/states_screens/{ => online}/online_profile_friends.cpp (98%) rename src/states_screens/{ => online}/online_profile_friends.hpp (98%) rename src/states_screens/{ => online}/online_profile_servers.cpp (95%) rename src/states_screens/{ => online}/online_profile_servers.hpp (97%) rename src/states_screens/{ => online}/online_profile_settings.cpp (97%) rename src/states_screens/{ => online}/online_profile_settings.hpp (97%) rename src/states_screens/{ => online}/online_screen.cpp (97%) rename src/states_screens/{ => online}/online_screen.hpp (100%) rename src/states_screens/{ => online}/online_user_search.cpp (99%) rename src/states_screens/{ => online}/online_user_search.hpp (100%) rename src/states_screens/{ => online}/register_screen.cpp (99%) rename src/states_screens/{ => online}/register_screen.hpp (100%) rename src/states_screens/{ => online}/server_selection.cpp (99%) rename src/states_screens/{ => online}/server_selection.hpp (100%) rename src/states_screens/{ => online}/tracks_screen.cpp (99%) rename src/states_screens/{ => online}/tracks_screen.hpp (100%) diff --git a/src/main.cpp b/src/main.cpp index 7a2b5a0fa..b850cf6a8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -234,8 +234,8 @@ #include "replay/replay_play.hpp" #include "replay/replay_recorder.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/networking_lobby.hpp" -#include "states_screens/register_screen.hpp" +#include "states_screens/online/networking_lobby.hpp" +#include "states_screens/online/register_screen.hpp" #include "states_screens/state_manager.hpp" #include "states_screens/options/user_screen.hpp" #include "states_screens/dialogs/init_android_dialog.hpp" diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp index 8dd5e2389..67e7b6207 100644 --- a/src/network/network_config.cpp +++ b/src/network/network_config.cpp @@ -23,10 +23,10 @@ #include "network/transport_address.hpp" #include "online/xml_request.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/networking_lobby.hpp" -#include "states_screens/online_lan.hpp" -#include "states_screens/online_profile_servers.hpp" -#include "states_screens/online_screen.hpp" +#include "states_screens/online/networking_lobby.hpp" +#include "states_screens/online/online_lan.hpp" +#include "states_screens/online/online_profile_servers.hpp" +#include "states_screens/online/online_screen.hpp" NetworkConfig *NetworkConfig::m_network_config = NULL; diff --git a/src/network/protocols/client_lobby.cpp b/src/network/protocols/client_lobby.cpp index 7d1fca44d..eec1bd78c 100644 --- a/src/network/protocols/client_lobby.cpp +++ b/src/network/protocols/client_lobby.cpp @@ -42,11 +42,11 @@ #include "network/server_config.hpp" #include "network/stk_host.hpp" #include "network/stk_peer.hpp" -#include "states_screens/networking_lobby.hpp" -#include "states_screens/network_kart_selection.hpp" +#include "states_screens/online/networking_lobby.hpp" +#include "states_screens/online/network_kart_selection.hpp" #include "states_screens/race_result_gui.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/tracks_screen.hpp" +#include "states_screens/online/tracks_screen.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "utils/log.hpp" diff --git a/src/network/protocols/connect_to_server.cpp b/src/network/protocols/connect_to_server.cpp index b66d9d3da..dcb1bea28 100644 --- a/src/network/protocols/connect_to_server.cpp +++ b/src/network/protocols/connect_to_server.cpp @@ -30,7 +30,7 @@ #include "network/stk_host.hpp" #include "network/stk_peer.hpp" #include "online/xml_request.hpp" -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include "utils/time.hpp" #include "utils/log.hpp" diff --git a/src/network/protocols/server_lobby.cpp b/src/network/protocols/server_lobby.cpp index b4547a45d..3df6b853b 100644 --- a/src/network/protocols/server_lobby.cpp +++ b/src/network/protocols/server_lobby.cpp @@ -40,7 +40,7 @@ #include "online/online_profile.hpp" #include "online/request_manager.hpp" #include "race/race_manager.hpp" -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include "states_screens/race_result_gui.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp index 8177f25e7..ab2e863df 100644 --- a/src/online/online_player_profile.cpp +++ b/src/online/online_player_profile.cpp @@ -27,7 +27,7 @@ #include "online/online_profile.hpp" #include "online/profile_manager.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/online_profile_friends.hpp" +#include "states_screens/online/online_profile_friends.hpp" #include "states_screens/options/user_screen.hpp" #include "states_screens/dialogs/change_password_dialog.hpp" #include "states_screens/dialogs/user_info_dialog.hpp" diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp index 878131dfd..b29ad7d14 100644 --- a/src/states_screens/dialogs/registration_dialog.cpp +++ b/src/states_screens/dialogs/registration_dialog.cpp @@ -20,7 +20,7 @@ #include "guiengine/engine.hpp" #include "guiengine/widgets.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/register_screen.hpp" +#include "states_screens/online/register_screen.hpp" #include "utils/translation.hpp" #include "utils/string_utils.hpp" diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp index 5acd5eb3d..845945ea5 100644 --- a/src/states_screens/dialogs/server_info_dialog.cpp +++ b/src/states_screens/dialogs/server_info_dialog.cpp @@ -26,7 +26,7 @@ #include "network/server.hpp" #include "network/server_config.hpp" #include "network/stk_host.hpp" -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include "states_screens/state_manager.hpp" #include "utils/string_utils.hpp" diff --git a/src/states_screens/dialogs/splitscreen_player_dialog.cpp b/src/states_screens/dialogs/splitscreen_player_dialog.cpp index f52e95367..33fa63faa 100644 --- a/src/states_screens/dialogs/splitscreen_player_dialog.cpp +++ b/src/states_screens/dialogs/splitscreen_player_dialog.cpp @@ -30,7 +30,7 @@ #include "guiengine/widgets/ribbon_widget.hpp" #include "guiengine/widgets/spinner_widget.hpp" #include "network/network_config.hpp" -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include "utils/translation.hpp" #include diff --git a/src/states_screens/dialogs/user_info_dialog.cpp b/src/states_screens/dialogs/user_info_dialog.cpp index 7b02727be..1bb05bb29 100644 --- a/src/states_screens/dialogs/user_info_dialog.cpp +++ b/src/states_screens/dialogs/user_info_dialog.cpp @@ -21,8 +21,8 @@ #include "guiengine/dialog_queue.hpp" #include "guiengine/engine.hpp" #include "online/online_profile.hpp" -#include "states_screens/online_profile_achievements.hpp" -#include "states_screens/online_profile_friends.hpp" +#include "states_screens/online/online_profile_achievements.hpp" +#include "states_screens/online/online_profile_friends.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/ghost_replay_selection.cpp b/src/states_screens/ghost_replay_selection.cpp index 142935cdc..26fff06d8 100644 --- a/src/states_screens/ghost_replay_selection.cpp +++ b/src/states_screens/ghost_replay_selection.cpp @@ -24,7 +24,7 @@ #include "karts/kart_properties_manager.hpp" #include "states_screens/dialogs/ghost_replay_info_dialog.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/tracks_screen.hpp" +#include "states_screens/online/tracks_screen.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp index 5b0c42fa4..0f802f240 100644 --- a/src/states_screens/gp_info_screen.cpp +++ b/src/states_screens/gp_info_screen.cpp @@ -35,7 +35,7 @@ #include "race/grand_prix_data.hpp" #include "race/race_manager.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/tracks_screen.hpp" +#include "states_screens/online/tracks_screen.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp index afddc90b1..3107252c4 100644 --- a/src/states_screens/main_menu_screen.cpp +++ b/src/states_screens/main_menu_screen.cpp @@ -44,9 +44,9 @@ #include "states_screens/grand_prix_editor_screen.hpp" #include "states_screens/help_screen_1.hpp" #include "states_screens/offline_kart_selection.hpp" -#include "states_screens/online_profile_achievements.hpp" -#include "states_screens/online_profile_servers.hpp" -#include "states_screens/online_screen.hpp" +#include "states_screens/online/online_profile_achievements.hpp" +#include "states_screens/online/online_profile_servers.hpp" +#include "states_screens/online/online_screen.hpp" #include "states_screens/options/options_screen_video.hpp" #include "states_screens/state_manager.hpp" #include "states_screens/options/user_screen.hpp" diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/online/create_server_screen.cpp similarity index 99% rename from src/states_screens/create_server_screen.cpp rename to src/states_screens/online/create_server_screen.cpp index 74a9ffa78..b58257476 100644 --- a/src/states_screens/create_server_screen.cpp +++ b/src/states_screens/online/create_server_screen.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/create_server_screen.hpp" +#include "states_screens/online/create_server_screen.hpp" #include "audio/sfx_manager.hpp" #include "config/player_manager.hpp" @@ -25,7 +25,7 @@ #include "network/server_config.hpp" #include "network/stk_host.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include "utils/separate_process.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/create_server_screen.hpp b/src/states_screens/online/create_server_screen.hpp similarity index 100% rename from src/states_screens/create_server_screen.hpp rename to src/states_screens/online/create_server_screen.hpp diff --git a/src/states_screens/network_kart_selection.cpp b/src/states_screens/online/network_kart_selection.cpp similarity index 97% rename from src/states_screens/network_kart_selection.cpp rename to src/states_screens/online/network_kart_selection.cpp index ebb3cb133..1b1c95ea3 100644 --- a/src/states_screens/network_kart_selection.cpp +++ b/src/states_screens/online/network_kart_selection.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/network_kart_selection.hpp" +#include "states_screens/online/network_kart_selection.hpp" #include "config/user_config.hpp" #include "input/device_manager.hpp" @@ -23,7 +23,7 @@ #include "network/protocols/lobby_protocol.hpp" #include "network/stk_host.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/tracks_screen.hpp" +#include "states_screens/online/tracks_screen.hpp" using namespace GUIEngine; diff --git a/src/states_screens/network_kart_selection.hpp b/src/states_screens/online/network_kart_selection.hpp similarity index 100% rename from src/states_screens/network_kart_selection.hpp rename to src/states_screens/online/network_kart_selection.hpp diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/online/networking_lobby.cpp similarity index 99% rename from src/states_screens/networking_lobby.cpp rename to src/states_screens/online/networking_lobby.cpp index 8169678df..058a58d74 100644 --- a/src/states_screens/networking_lobby.cpp +++ b/src/states_screens/online/networking_lobby.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include #include diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/online/networking_lobby.hpp similarity index 100% rename from src/states_screens/networking_lobby.hpp rename to src/states_screens/online/networking_lobby.hpp diff --git a/src/states_screens/online_lan.cpp b/src/states_screens/online/online_lan.cpp similarity index 93% rename from src/states_screens/online_lan.cpp rename to src/states_screens/online/online_lan.cpp index d32fd47c5..29e4bb2dc 100644 --- a/src/states_screens/online_lan.cpp +++ b/src/states_screens/online/online_lan.cpp @@ -15,14 +15,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_profile_servers.hpp" +#include "states_screens/online/online_profile_servers.hpp" #include "guiengine/screen.hpp" #include "network/network_config.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/create_server_screen.hpp" -#include "states_screens/online_lan.hpp" -#include "states_screens/server_selection.hpp" +#include "states_screens/online/create_server_screen.hpp" +#include "states_screens/online/online_lan.hpp" +#include "states_screens/online/server_selection.hpp" #include "utils/translation.hpp" #include diff --git a/src/states_screens/online_lan.hpp b/src/states_screens/online/online_lan.hpp similarity index 97% rename from src/states_screens/online_lan.hpp rename to src/states_screens/online/online_lan.hpp index e585763e3..9d4952a2e 100644 --- a/src/states_screens/online_lan.hpp +++ b/src/states_screens/online/online_lan.hpp @@ -24,7 +24,7 @@ #include "guiengine/screen.hpp" #include "guiengine/widgets.hpp" -#include "states_screens/online_profile_base.hpp" +#include "states_screens/online/online_profile_base.hpp" namespace GUIEngine { class Widget; } diff --git a/src/states_screens/online_profile_achievements.cpp b/src/states_screens/online/online_profile_achievements.cpp similarity index 99% rename from src/states_screens/online_profile_achievements.cpp rename to src/states_screens/online/online_profile_achievements.cpp index b18e6b5d3..711eda129 100644 --- a/src/states_screens/online_profile_achievements.cpp +++ b/src/states_screens/online/online_profile_achievements.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_profile_achievements.hpp" +#include "states_screens/online/online_profile_achievements.hpp" #include "achievements/achievement_info.hpp" #include "achievements/achievements_manager.hpp" diff --git a/src/states_screens/online_profile_achievements.hpp b/src/states_screens/online/online_profile_achievements.hpp similarity index 98% rename from src/states_screens/online_profile_achievements.hpp rename to src/states_screens/online/online_profile_achievements.hpp index a25aa5e73..ddd4bf22f 100644 --- a/src/states_screens/online_profile_achievements.hpp +++ b/src/states_screens/online/online_profile_achievements.hpp @@ -24,7 +24,7 @@ #include "guiengine/screen.hpp" #include "guiengine/widgets.hpp" -#include "states_screens/online_profile_base.hpp" +#include "states_screens/online/online_profile_base.hpp" #include "online/profile_manager.hpp" diff --git a/src/states_screens/online_profile_base.cpp b/src/states_screens/online/online_profile_base.cpp similarity index 94% rename from src/states_screens/online_profile_base.cpp rename to src/states_screens/online/online_profile_base.cpp index 0088cdaf3..1fa5f5240 100644 --- a/src/states_screens/online_profile_base.cpp +++ b/src/states_screens/online/online_profile_base.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_profile_base.hpp" +#include "states_screens/online/online_profile_base.hpp" #include "config/player_manager.hpp" #include "guiengine/engine.hpp" @@ -25,10 +25,10 @@ #include "online/online_profile.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" -#include "states_screens/online_profile_friends.hpp" -#include "states_screens/online_profile_achievements.hpp" -#include "states_screens/online_profile_servers.hpp" -#include "states_screens/online_profile_settings.hpp" +#include "states_screens/online/online_profile_friends.hpp" +#include "states_screens/online/online_profile_achievements.hpp" +#include "states_screens/online/online_profile_servers.hpp" +#include "states_screens/online/online_profile_settings.hpp" #include #include diff --git a/src/states_screens/online_profile_base.hpp b/src/states_screens/online/online_profile_base.hpp similarity index 100% rename from src/states_screens/online_profile_base.hpp rename to src/states_screens/online/online_profile_base.hpp diff --git a/src/states_screens/online_profile_friends.cpp b/src/states_screens/online/online_profile_friends.cpp similarity index 98% rename from src/states_screens/online_profile_friends.cpp rename to src/states_screens/online/online_profile_friends.cpp index 55f19837e..8c9061998 100644 --- a/src/states_screens/online_profile_friends.cpp +++ b/src/states_screens/online/online_profile_friends.cpp @@ -15,14 +15,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_profile_friends.hpp" +#include "states_screens/online/online_profile_friends.hpp" #include "guiengine/engine.hpp" #include "guiengine/scalable_font.hpp" #include "guiengine/screen.hpp" #include "guiengine/widget.hpp" #include "states_screens/dialogs/user_info_dialog.hpp" -#include "states_screens/online_user_search.hpp" +#include "states_screens/online/online_user_search.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/online_profile_friends.hpp b/src/states_screens/online/online_profile_friends.hpp similarity index 98% rename from src/states_screens/online_profile_friends.hpp rename to src/states_screens/online/online_profile_friends.hpp index fd45c1980..34f6935f2 100644 --- a/src/states_screens/online_profile_friends.hpp +++ b/src/states_screens/online/online_profile_friends.hpp @@ -24,7 +24,7 @@ #include "guiengine/screen.hpp" #include "guiengine/widgets.hpp" -#include "states_screens/online_profile_base.hpp" +#include "states_screens/online/online_profile_base.hpp" #include "online/profile_manager.hpp" diff --git a/src/states_screens/online_profile_servers.cpp b/src/states_screens/online/online_profile_servers.cpp similarity index 95% rename from src/states_screens/online_profile_servers.cpp rename to src/states_screens/online/online_profile_servers.cpp index 772b4c2fa..44844f660 100644 --- a/src/states_screens/online_profile_servers.cpp +++ b/src/states_screens/online/online_profile_servers.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_profile_servers.hpp" +#include "states_screens/online/online_profile_servers.hpp" #include "audio/sfx_manager.hpp" #include "config/player_manager.hpp" @@ -27,9 +27,9 @@ #include "network/server_config.hpp" #include "network/servers_manager.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/create_server_screen.hpp" -#include "states_screens/networking_lobby.hpp" -#include "states_screens/server_selection.hpp" +#include "states_screens/online/create_server_screen.hpp" +#include "states_screens/online/networking_lobby.hpp" +#include "states_screens/online/server_selection.hpp" #include "utils/translation.hpp" #include diff --git a/src/states_screens/online_profile_servers.hpp b/src/states_screens/online/online_profile_servers.hpp similarity index 97% rename from src/states_screens/online_profile_servers.hpp rename to src/states_screens/online/online_profile_servers.hpp index b8633c610..5b29e3a1b 100644 --- a/src/states_screens/online_profile_servers.hpp +++ b/src/states_screens/online/online_profile_servers.hpp @@ -24,7 +24,7 @@ #include "guiengine/screen.hpp" #include "guiengine/widgets.hpp" -#include "states_screens/online_profile_base.hpp" +#include "states_screens/online/online_profile_base.hpp" namespace GUIEngine { class Widget; } diff --git a/src/states_screens/online_profile_settings.cpp b/src/states_screens/online/online_profile_settings.cpp similarity index 97% rename from src/states_screens/online_profile_settings.cpp rename to src/states_screens/online/online_profile_settings.cpp index 141123d4a..ca929cdae 100644 --- a/src/states_screens/online_profile_settings.cpp +++ b/src/states_screens/online/online_profile_settings.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_profile_settings.hpp" +#include "states_screens/online/online_profile_settings.hpp" #include "guiengine/engine.hpp" #include "guiengine/scalable_font.hpp" diff --git a/src/states_screens/online_profile_settings.hpp b/src/states_screens/online/online_profile_settings.hpp similarity index 97% rename from src/states_screens/online_profile_settings.hpp rename to src/states_screens/online/online_profile_settings.hpp index 6ed75ec8c..b4e1fa235 100644 --- a/src/states_screens/online_profile_settings.hpp +++ b/src/states_screens/online/online_profile_settings.hpp @@ -24,7 +24,7 @@ #include "guiengine/screen.hpp" #include "guiengine/widgets.hpp" -#include "states_screens/online_profile_base.hpp" +#include "states_screens/online/online_profile_base.hpp" namespace GUIEngine { class Widget; } diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online/online_screen.cpp similarity index 97% rename from src/states_screens/online_screen.cpp rename to src/states_screens/online/online_screen.cpp index 26abb2427..d32f76136 100644 --- a/src/states_screens/online_screen.cpp +++ b/src/states_screens/online/online_screen.cpp @@ -35,11 +35,11 @@ #include "network/stk_host.hpp" #include "network/stk_peer.hpp" #include "online/request_manager.hpp" -#include "states_screens/networking_lobby.hpp" -#include "states_screens/online_lan.hpp" -#include "states_screens/online_profile_achievements.hpp" -#include "states_screens/online_profile_servers.hpp" -#include "states_screens/online_screen.hpp" +#include "states_screens/online/networking_lobby.hpp" +#include "states_screens/online/online_lan.hpp" +#include "states_screens/online/online_profile_achievements.hpp" +#include "states_screens/online/online_profile_servers.hpp" +#include "states_screens/online/online_screen.hpp" #include "states_screens/state_manager.hpp" #include "states_screens/options/user_screen.hpp" #include "states_screens/dialogs/general_text_field_dialog.hpp" diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online/online_screen.hpp similarity index 100% rename from src/states_screens/online_screen.hpp rename to src/states_screens/online/online_screen.hpp diff --git a/src/states_screens/online_user_search.cpp b/src/states_screens/online/online_user_search.cpp similarity index 99% rename from src/states_screens/online_user_search.cpp rename to src/states_screens/online/online_user_search.cpp index 09c7d6065..108595dde 100644 --- a/src/states_screens/online_user_search.cpp +++ b/src/states_screens/online/online_user_search.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/online_user_search.hpp" +#include "states_screens/online/online_user_search.hpp" #include "audio/sfx_manager.hpp" #include "config/player_manager.hpp" diff --git a/src/states_screens/online_user_search.hpp b/src/states_screens/online/online_user_search.hpp similarity index 100% rename from src/states_screens/online_user_search.hpp rename to src/states_screens/online/online_user_search.hpp diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/online/register_screen.cpp similarity index 99% rename from src/states_screens/register_screen.cpp rename to src/states_screens/online/register_screen.cpp index 1b2e75984..7ff8fdcec 100644 --- a/src/states_screens/register_screen.cpp +++ b/src/states_screens/online/register_screen.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/register_screen.hpp" +#include "states_screens/online/register_screen.hpp" #include "config/player_manager.hpp" #include "config/user_config.hpp" diff --git a/src/states_screens/register_screen.hpp b/src/states_screens/online/register_screen.hpp similarity index 100% rename from src/states_screens/register_screen.hpp rename to src/states_screens/online/register_screen.hpp diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/online/server_selection.cpp similarity index 99% rename from src/states_screens/server_selection.cpp rename to src/states_screens/online/server_selection.cpp index d50e52dee..6ba2f0d87 100644 --- a/src/states_screens/server_selection.cpp +++ b/src/states_screens/online/server_selection.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/server_selection.hpp" +#include "states_screens/online/server_selection.hpp" #include "audio/sfx_manager.hpp" #include "graphics/irr_driver.hpp" diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/online/server_selection.hpp similarity index 100% rename from src/states_screens/server_selection.hpp rename to src/states_screens/online/server_selection.hpp diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/online/tracks_screen.cpp similarity index 99% rename from src/states_screens/tracks_screen.cpp rename to src/states_screens/online/tracks_screen.cpp index b1864389c..26a329d12 100644 --- a/src/states_screens/tracks_screen.cpp +++ b/src/states_screens/online/tracks_screen.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/tracks_screen.hpp" +#include "states_screens/online/tracks_screen.hpp" #include "challenges/unlock_manager.hpp" #include "config/player_manager.hpp" diff --git a/src/states_screens/tracks_screen.hpp b/src/states_screens/online/tracks_screen.hpp similarity index 100% rename from src/states_screens/tracks_screen.hpp rename to src/states_screens/online/tracks_screen.hpp diff --git a/src/states_screens/options/user_screen.cpp b/src/states_screens/options/user_screen.cpp index 7b3b6e51a..2ffa62c55 100644 --- a/src/states_screens/options/user_screen.cpp +++ b/src/states_screens/options/user_screen.cpp @@ -38,7 +38,7 @@ #include "states_screens/options/options_screen_language.hpp" #include "states_screens/options/options_screen_ui.hpp" #include "states_screens/options/options_screen_video.hpp" -#include "states_screens/register_screen.hpp" +#include "states_screens/online/register_screen.hpp" #include "states_screens/state_manager.hpp" diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp index 75068e0d2..5db9b8fc0 100644 --- a/src/states_screens/race_result_gui.cpp +++ b/src/states_screens/race_result_gui.cpp @@ -54,7 +54,7 @@ #include "scriptengine/property_animator.hpp" #include "states_screens/feature_unlocked.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/networking_lobby.hpp" +#include "states_screens/online/networking_lobby.hpp" #include "states_screens/race_setup_screen.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp index 1953c99b9..7acf7158c 100644 --- a/src/states_screens/track_info_screen.cpp +++ b/src/states_screens/track_info_screen.cpp @@ -37,7 +37,7 @@ #include "race/highscore_manager.hpp" #include "race/race_manager.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/tracks_screen.hpp" +#include "states_screens/online/tracks_screen.hpp" #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "utils/string_utils.hpp"