commit 70c44d8a

sago007 · 2020-07-04 07:49
70c44d8a000d7fbd421c78ce4fa23e89710c1926 patch · browse files
parent cfb8bc477806623d032004620ca36734f3b1f315

Moved some initialization to initializer lists

Changed files

M	source/code/MenuSystem.cpp before

diff --git a/source/code/MenuSystem.cpp b/source/code/MenuSystem.cpp index cce280e..5d3af78 100644 --- a/source/code/MenuSystem.cpp +++ b/source/code/MenuSystem.cpp

@@ -143,15 +143,11 @@ void Menu::addButton(Button* b) {

placeButtons();

}

-Menu::Menu(SDL_Renderer* screen) : buttons{std::vector<Button*>(10)} {

- this->screen = screen;

- isSubmenu = true;

+Menu::Menu(SDL_Renderer* screen) : buttons{std::vector<Button*>(10)}, isSubmenu{true}, screen{screen} {

exit.setLabel( _("Back") );

}

-Menu::Menu(SDL_Renderer* screen,bool submenu) : buttons{std::vector<Button*>(0)} {

- this->screen = screen;

- isSubmenu = submenu;

+Menu::Menu(SDL_Renderer* screen,bool submenu) : buttons{std::vector<Button*>(0)}, isSubmenu{submenu}, screen{screen} {

if (isSubmenu) {

exit.setLabel( _("Back") );

}

@@ -160,10 +156,7 @@ Menu::Menu(SDL_Renderer* screen,bool submenu) : buttons{std::vector<Button*>(0)}

}

-Menu::Menu(SDL_Renderer* screen, const std::string& title, bool submenu) : title{title} {

- this->screen = screen;

- buttons = std::vector<Button*>(0);

- isSubmenu = submenu;

+Menu::Menu(SDL_Renderer* screen, const std::string& title, bool submenu) : buttons{std::vector<Button*>(0)}, isSubmenu{submenu}, screen{screen}, title{title} {

if (isSubmenu) {

exit.setLabel(_("Back") );

}