Removed the uicustomcontrol file

src/smw/CMakeLists.txt

@@ -27,8 +27,6 @@ add_executable(smw WIN32
 	objecthazard.h
 	player.cpp
 	player.h
-	uicustomcontrol.cpp
-	uicustomcontrol.h
 	world.cpp
 	world.h
 

src/smw/GSMenu.cpp

@@ -12,10 +12,12 @@
 #include "Score.h"
 #include "ui/MI_BonusWheel.h"
 #include "ui/MI_MapBrowser.h"
+#include "ui/MI_MapField.h"
 #include "ui/MI_MapFilterScroll.h"
 #include "ui/MI_TournamentScoreboard.h"
 #include "ui/MI_TourStop.h"
 #include "ui/MI_World.h"
+#include "world.h"
 
 #include "menu/BonusWheelMenu.h"
 #include "menu/GameSettingsMenu.h"

src/smw/GSMenu.h

@@ -1,10 +1,12 @@
 #ifndef GAMESTATE_MENU_H
 #define GAMESTATE_MENU_H
 
-#include "uicustomcontrol.h"
-
 #include "GameState.h"
 
+#include <vector>
+
+class UI_Menu;
+
 class UI_BonusWheelMenu;
 class UI_GameSettingsMenu;
 class UI_MainMenu;

src/smw/menu/WorldMenu.cpp

@@ -7,7 +7,6 @@
 #include "ui/MI_Text.h"
 #include "ui/MI_TourStop.h"
 #include "ui/MI_World.h"
-#include "uicustomcontrol.h"
 
 extern CResourceManager* rm;
 extern CGameValues game_values;

src/smw/menu/network/NetLobbyMenu.cpp

@@ -2,9 +2,11 @@
 
 #include "net.h"
 #include "ResourceManager.h"
+#include "ui/MI_Button.h"
 #include "ui/MI_Image.h"
 #include "ui/MI_Text.h"
 #include "ui/MI_TextField.h"
+#include "ui/NetworkListScroll.h"
 
 extern CResourceManager* rm;
 

src/smw/menu/network/NetLobbyMenu.h

@@ -1,17 +1,18 @@
-#ifndef MENU_NETLOBBY_H
-#define MENU_NETLOBBY_H
+#pragma once
 
 #include "uimenu.h"
-#include "uicustomcontrol.h"
 
+class MI_Button;
+class MI_Image;
+class MI_NetworkListScroll;
+class MI_Text;
 class MI_TextField;
 
 /*
     Description.
 */
 
-class UI_NetLobbyMenu : public UI_Menu
-{
+class UI_NetLobbyMenu : public UI_Menu {
 public:
     UI_NetLobbyMenu();
     ~UI_NetLobbyMenu();
@@ -21,19 +22,17 @@ class UI_NetLobbyMenu : public UI_Menu
     void Restore();
 
 private:
-    MI_NetworkListScroll * miNetLobbyScroll;
+    MI_NetworkListScroll* miNetLobbyScroll = nullptr;
 
-    MI_Button * miNetLobbyNewRoomButton;
-    MI_TextField * miNetLobbyFilterField;
-    MI_Button * miNetLobbyRefreshButton;
-    MI_Button * miNetLobbyBackButton;
+    MI_Button* miNetLobbyNewRoomButton = nullptr;
+    MI_TextField* miNetLobbyFilterField = nullptr;
+    MI_Button* miNetLobbyRefreshButton = nullptr;
+    MI_Button* miNetLobbyBackButton = nullptr;
 
-    MI_Image * miNetLobbyJoiningDialogImage;
-    MI_Text * miNetLobbyJoiningDialogText;
+    MI_Image* miNetLobbyJoiningDialogImage = nullptr;
+    MI_Text* miNetLobbyJoiningDialogText = nullptr;
 
-    MI_Image * miNetLobbyLeftHeaderBar;
-    MI_Image * miNetLobbyRightHeaderBar;
-    MI_Text * miNetLobbyHeaderText;
+    MI_Image* miNetLobbyLeftHeaderBar = nullptr;
+    MI_Image* miNetLobbyRightHeaderBar = nullptr;
+    MI_Text* miNetLobbyHeaderText = nullptr;
 };
-
-#endif // MENU_NETLOBBY_H

src/smw/menu/network/NetServersMenu.cpp

@@ -2,9 +2,11 @@
 
 #include "net.h"
 #include "ResourceManager.h"
+#include "ui/MI_Button.h"
 #include "ui/MI_Image.h"
 #include "ui/MI_Text.h"
 #include "ui/MI_TextField.h"
+#include "ui/NetworkListScroll.h"
 
 extern CResourceManager* rm;
 

src/smw/menu/network/NetServersMenu.h

@@ -1,18 +1,15 @@
-#ifndef MENU_NETSERVERS_H
-#define MENU_NETSERVERS_H
+#pragma once
 
 #include "uimenu.h"
-#include "uicontrol.h"
-#include "uicustomcontrol.h"
 
+class MI_Button;
+class MI_Image;
+class MI_NetworkListScroll;
+class MI_Text;
 class MI_TextField;
 
-/*
-    Description.
-*/
 
-class UI_NetServersMenu : public UI_Menu
-{
+class UI_NetServersMenu : public UI_Menu {
 public:
     UI_NetServersMenu();
     ~UI_NetServersMenu();
@@ -24,21 +21,19 @@ class UI_NetServersMenu : public UI_Menu
     void RefreshScroll();
 
 private:
-    MI_Button * miNetServersSelectButton;
-    MI_Text * miNetServersSelectedHostText;
-    MI_Button * miNetServersConnectButton;
-    MI_Button * miNetServersAddRemoveButton;
-    MI_TextField * miNetServersNicknameField;
-    MI_Button * miNetServersBackButton;
+    MI_Button* miNetServersSelectButton = nullptr;
+    MI_Text* miNetServersSelectedHostText = nullptr;
+    MI_Button* miNetServersConnectButton = nullptr;
+    MI_Button* miNetServersAddRemoveButton = nullptr;
+    MI_TextField* miNetServersNicknameField = nullptr;
+    MI_Button* miNetServersBackButton = nullptr;
 
-    MI_NetworkListScroll * miNetServersScroll;
+    MI_NetworkListScroll* miNetServersScroll = nullptr;
 
-    MI_Image * miNetServersConnectingDialogImage;
-    MI_Text * miNetServersConnectingDialogText;
+    MI_Image* miNetServersConnectingDialogImage = nullptr;
+    MI_Text* miNetServersConnectingDialogText = nullptr;
 
-    MI_Image * miNetServersLeftHeaderBar;
-    MI_Image * miNetServersRightHeaderBar;
-    MI_Text * miNetServersHeaderText;
+    MI_Image* miNetServersLeftHeaderBar = nullptr;
+    MI_Image* miNetServersRightHeaderBar = nullptr;
+    MI_Text* miNetServersHeaderText = nullptr;
 };
-
-#endif // MENU_NETSERVERS_H

src/smw/menu/options/PowerupSettingsMenu.cpp

@@ -2,7 +2,9 @@
 
 #include "GameValues.h"
 #include "ResourceManager.h"
+#include "ui/MI_Button.h"
 #include "ui/MI_Image.h"
+#include "ui/MI_SelectField.h"
 #include "ui/MI_StoredPowerupResetButton.h"
 #include "ui/MI_Text.h"
 

src/smw/menu/options/PowerupSettingsMenu.h

@@ -1,44 +1,42 @@
-#ifndef MENU_POWERUPSETTINGS_H
-#define MENU_POWERUPSETTINGS_H
+#pragma once
 
 #include "uimenu.h"
-#include "uicontrol.h"
-#include "uicustomcontrol.h"
 
+class MI_Button;
+class MI_Image;
+class MI_SelectField;
 class MI_StoredPowerupResetButton;
+class MI_Text;
 
 /*
     In this menu, you can change some powerup settings,
     like fire rate, reloading of [?] blocks and bonus items.
 */
 
-class UI_PowerupSettingsMenu : public UI_Menu
-{
+class UI_PowerupSettingsMenu : public UI_Menu {
 public:
     UI_PowerupSettingsMenu();
     ~UI_PowerupSettingsMenu();
 
 private:
-    MI_SelectField * miStoredPowerupDelayField;
-    MI_SelectField * miItemRespawnField;
-    MI_SelectField * miSwapStyleField;
-    MI_SelectField * miBonusWheelField;
-    MI_SelectField * miKeepPowerupField;
-    MI_SelectField * miHiddenBlockRespawnField;
-    MI_StoredPowerupResetButton * miStoredPowerupResetButton;
-    MI_Button * miPowerupSettingsMenuBackButton;
-
-    MI_Image * miPowerupSettingsMenuLeftHeaderBar;
-    MI_Image * miPowerupSettingsMenuRightHeaderBar;
-    MI_Text * miPowerupSettingsMenuHeaderText;
+    MI_SelectField* miStoredPowerupDelayField = nullptr;
+    MI_SelectField* miItemRespawnField = nullptr;
+    MI_SelectField* miSwapStyleField = nullptr;
+    MI_SelectField* miBonusWheelField = nullptr;
+    MI_SelectField* miKeepPowerupField = nullptr;
+    MI_SelectField* miHiddenBlockRespawnField = nullptr;
+    MI_StoredPowerupResetButton* miStoredPowerupResetButton = nullptr;
+    MI_Button* miPowerupSettingsMenuBackButton = nullptr;
+
+    MI_Image* miPowerupSettingsMenuLeftHeaderBar = nullptr;
+    MI_Image* miPowerupSettingsMenuRightHeaderBar = nullptr;
+    MI_Text* miPowerupSettingsMenuHeaderText = nullptr;
 
     /*
-    MI_Image * miPowerupSelectionDialogImage;
-    MI_Text * miPowerupSelectionDialogExitText;
-    MI_Text * miPowerupSelectionDialogTournamentText;
-    MI_Button * miPowerupSelectionDialogYesButton;
-    MI_Button * miPowerupSelectionDialogNoButton;
+    MI_Image* miPowerupSelectionDialogImage = nullptr;
+    MI_Text* miPowerupSelectionDialogExitText = nullptr;
+    MI_Text* miPowerupSelectionDialogTournamentText = nullptr;
+    MI_Button* miPowerupSelectionDialogYesButton = nullptr;
+    MI_Button* miPowerupSelectionDialogNoButton = nullptr;
     */
 };
-
-#endif // MENU_POWERUPSETTINGS_H