Skip to content

Commit

Permalink
FIX - AssetSelector: Compiles on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@deadbaed
deadbaed committed Jun 14, 2020
1 parent 45cd6aa commit b19d948
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 52 deletions.
10 changes: 5 additions & 5 deletions GameScene/GameScene.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ void GameScene::Init(void)
p2->SetPosition(irr::core::vector3df(20, 0, 0));
AddGameObject(p);
AddGameObject(p2);
this->_ctrl->_music->Play(AssetSelector(MUSIC_GAME));
this->_ctrl->_music->Play(AssetSelector(MUSIC_GAME).string());
std::shared_ptr<mapGenerator> map = std::make_shared<mapGenerator>(vector3df(0,0,0), 6, 11, 11);
map->generate(_ctrl, _obj_list, AssetSelector(FLOOR_ASSET), 100);
map->generateWall(_ctrl, _obj_list, AssetSelector(WALL1_ASSET));
map->generateBorder(_ctrl, _obj_list, AssetSelector(WALL1_ASSET));
map->generateBlock(_ctrl, _obj_list, AssetSelector(WALL2_ASSET), 30);
map->generate(_ctrl, _obj_list, AssetSelector(FLOOR_ASSET).string(), 100);
map->generateWall(_ctrl, _obj_list, AssetSelector(WALL1_ASSET).string());
map->generateBorder(_ctrl, _obj_list, AssetSelector(WALL1_ASSET).string());
map->generateBlock(_ctrl, _obj_list, AssetSelector(WALL2_ASSET).string(), 30);
}
8 changes: 4 additions & 4 deletions Menu/ChoosePlayers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ ChoosePlayers::ChoosePlayers(const std::shared_ptr<IrrlichtController> &ctrl, co

void ChoosePlayers::Init(void)
{
this->_buttonOnePlayer = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(640, HEIGHT - 100), vector2d<int>(0, 100), GUI_ID_ONE_PLAYER_BUTTON, AssetSelector(ONE_PLAYER_GREY_C), AssetSelector(ONE_PLAYER_C));
this->_buttonTwoPlayers = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(640, HEIGHT - 100), vector2d<int>(640, 100), GUI_ID_TWO_PLAYERS_BUTTON, AssetSelector(TWO_PLAYERS_GREY_C), AssetSelector(TWO_PLAYERS_C));
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(1280, 100), vector2d<int>(0, 0), GUI_ID_BACK_BUTTON, AssetSelector(BUTTON_BACK_GREY_C), AssetSelector(BUTTON_BACK_C));
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_C));
this->_buttonOnePlayer = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(640, HEIGHT - 100), vector2d<int>(0, 100), GUI_ID_ONE_PLAYER_BUTTON, AssetSelector(ONE_PLAYER_GREY_C).string(), AssetSelector(ONE_PLAYER_C).string());
this->_buttonTwoPlayers = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(640, HEIGHT - 100), vector2d<int>(640, 100), GUI_ID_TWO_PLAYERS_BUTTON, AssetSelector(TWO_PLAYERS_GREY_C).string(), AssetSelector(TWO_PLAYERS_C).string());
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(1280, 100), vector2d<int>(0, 0), GUI_ID_BACK_BUTTON, AssetSelector(BUTTON_BACK_GREY_C).string(), AssetSelector(BUTTON_BACK_C).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_C).string());
}

void ChoosePlayers::Update(void)
Expand Down
8 changes: 4 additions & 4 deletions Menu/EndScene.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ void EndScene::Init(void)
p2->setPosition(irr::core::vector3df(1, -3, 9));
p->setPosition(irr::core::vector3df(-6, -3, 14));
}
this->_ctrl->_music->Play(AssetSelector(MUSIC_END));
this->_restart = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 600, HEIGHT / 2 - 300), GUI_ID_RESUME_BUTTON_PAUSED, AssetSelector(RESTART), AssetSelector(RESTART_DARK));
this->_exit = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 + 200, HEIGHT / 2 - 300), GUI_ID_EXIT_BUTTON_PAUSED, AssetSelector(EXIT_END), AssetSelector(EXIT_END_DARK));
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_END));
this->_ctrl->_music->Play(AssetSelector(MUSIC_END).string());
this->_restart = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 600, HEIGHT / 2 - 300), GUI_ID_RESUME_BUTTON_PAUSED, AssetSelector(RESTART).string(), AssetSelector(RESTART_DARK).string());
this->_exit = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 + 200, HEIGHT / 2 - 300), GUI_ID_EXIT_BUTTON_PAUSED, AssetSelector(EXIT_END).string(), AssetSelector(EXIT_END_DARK).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_END).string());
}
void EndScene::Update(void)
{
Expand Down
2 changes: 1 addition & 1 deletion Menu/Introduction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void Introduction::Update(void)
this->_logo = 3;
if (this->elapsed_seconds.count() > 5) {
this->_select = 1;
this->_ctrl->_music->Play(AssetSelector(MENU_INTRO_MUSIC));
this->_ctrl->_music->Play(AssetSelector(MENU_INTRO_MUSIC).string());
}
}
if (this->elapsed_seconds.count() > 1.5 && (this->_select == 1 || this->_select == 2)) {
Expand Down
10 changes: 5 additions & 5 deletions Menu/Menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ Menu::Menu(const std::shared_ptr<IrrlichtController> &ctrl, const std::string na

void Menu::Init(void)
{
this->_buttonSettings = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(427, HEIGHT), vector2d<int>(0, 0), GUI_ID_SETTINGS_BUTTON, AssetSelector(BUTTON_SETTINGS_GREY_M), AssetSelector(BUTTON_SETTINGS_M));
this->_buttonPlay = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(427, HEIGHT), vector2d<int>(427, 0), GUI_ID_PLAY_BUTTON, AssetSelector(PLAY_GREY_M), AssetSelector(PLAY_M));
this->_buttonExit = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(427, HEIGHT), vector2d<int>(854, 0), GUI_ID_EXIT_BUTTON, AssetSelector(EXIT_GREY_M), AssetSelector(EXIT_M));
this->_ctrl->_music->Play(AssetSelector(MUSIC_M));
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_M));
this->_buttonSettings = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(427, HEIGHT), vector2d<int>(0, 0), GUI_ID_SETTINGS_BUTTON, AssetSelector(BUTTON_SETTINGS_GREY_M).string(), AssetSelector(BUTTON_SETTINGS_M).string());
this->_buttonPlay = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(427, HEIGHT), vector2d<int>(427, 0), GUI_ID_PLAY_BUTTON, AssetSelector(PLAY_GREY_M).string(), AssetSelector(PLAY_M).string());
this->_buttonExit = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(427, HEIGHT), vector2d<int>(854, 0), GUI_ID_EXIT_BUTTON, AssetSelector(EXIT_GREY_M).string(), AssetSelector(EXIT_M).string());
this->_ctrl->_music->Play(AssetSelector(MUSIC_M).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_M).string());
}

void Menu::Update(void)
Expand Down
8 changes: 4 additions & 4 deletions Menu/PauseMenu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ PauseMenu::PauseMenu(const std::shared_ptr<IrrlichtController> &ctrl, const std:
void PauseMenu::Init(void)
{
this->_background = this->_ctrl->_driver->getTexture(AssetSelector(BACKGROUND_PM).c_str());
this->_resume = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 200, HEIGHT / 2 - 120), GUI_ID_RESUME_BUTTON_PAUSED, AssetSelector(RESUME_PM), AssetSelector(RESUME_DARK_PM));
this->_option = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH/ 2 - 200, HEIGHT / 2), GUI_ID_OPTION_BUTTON_PAUSED, AssetSelector(OPTION_PM), AssetSelector(OPTION_DARK_PM));
this->_exit = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 200, HEIGHT / 2 + 120), GUI_ID_EXIT_BUTTON_PAUSED, AssetSelector(EXIT_PM), AssetSelector(EXIT_DARK_PM));
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_PM));
this->_resume = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 200, HEIGHT / 2 - 120), GUI_ID_RESUME_BUTTON_PAUSED, AssetSelector(RESUME_PM).string(), AssetSelector(RESUME_DARK_PM).string());
this->_option = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH/ 2 - 200, HEIGHT / 2), GUI_ID_OPTION_BUTTON_PAUSED, AssetSelector(OPTION_PM).string(), AssetSelector(OPTION_DARK_PM).string());
this->_exit = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 200, HEIGHT / 2 + 120), GUI_ID_EXIT_BUTTON_PAUSED, AssetSelector(EXIT_PM).string(), AssetSelector(EXIT_DARK_PM).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_PM).string());
}

void PauseMenu::Update(void)
Expand Down
14 changes: 7 additions & 7 deletions Menu/SelectSkin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ SelectSkin::SelectSkin(const std::shared_ptr<IrrlichtController> &ctrl, const st
void SelectSkin::Init(void)
{
this->_background = this->_ctrl->_driver->getTexture(AssetSelector(BACKGROUND_SS).c_str());
this->_first_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 215, HEIGHT - 110), GUI_ID_SKIN_WHITE_BUTTON, AssetSelector(FIRST_SKIN_SS), AssetSelector(FIRST_SKIN_SS));
this->_second_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 105, HEIGHT - 110), GUI_ID_SKIN_GREEN_BUTTON, AssetSelector(SECOND_SKIN_SS), AssetSelector(SECOND_SKIN_SS));
this->_third_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 5, HEIGHT - 110), GUI_ID_SKIN_BLUE_BUTTON, AssetSelector(THIRD_SKIN_SS), AssetSelector(THIRD_SKIN_SS));
this->_fourth_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 115, HEIGHT - 110), GUI_ID_SKIN_BLACK_BUTTON, AssetSelector(FOURTH_SKIN_SS)), AssetSelector(FOURTH_SKIN_SS);
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_SS));
this->_buttonGo = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) + 305, HEIGHT - 160), GUI_ID_GO_BUTTON, AssetSelector(BUTTON_GO_SS)), AssetSelector(BUTTON_GO_DARK_SS);
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) - 550, (HEIGHT / 2) - 300), GUI_ID_PLAY_BUTTON, AssetSelector(BUTTON_BACK_SS)), AssetSelector(BUTTON_BACK_DARK_SS);
this->_first_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 215, HEIGHT - 110), GUI_ID_SKIN_WHITE_BUTTON, AssetSelector(FIRST_SKIN_SS).string(), AssetSelector(FIRST_SKIN_SS).string());
this->_second_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 105, HEIGHT - 110), GUI_ID_SKIN_GREEN_BUTTON, AssetSelector(SECOND_SKIN_SS).string(), AssetSelector(SECOND_SKIN_SS).string());
this->_third_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 5, HEIGHT - 110), GUI_ID_SKIN_BLUE_BUTTON, AssetSelector(THIRD_SKIN_SS).string(), AssetSelector(THIRD_SKIN_SS).string());
this->_fourth_skin = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 115, HEIGHT - 110), GUI_ID_SKIN_BLACK_BUTTON, AssetSelector(FOURTH_SKIN_SS).string(), AssetSelector(FOURTH_SKIN_SS).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_SS).string());
this->_buttonGo = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) + 305, HEIGHT - 160), GUI_ID_GO_BUTTON, AssetSelector(BUTTON_GO_SS).string(), AssetSelector(BUTTON_GO_DARK_SS).string());
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) - 550, (HEIGHT / 2) - 300), GUI_ID_PLAY_BUTTON, AssetSelector(BUTTON_BACK_SS).string(), AssetSelector(BUTTON_BACK_DARK_SS).string());

this->_current_skin = 0;
_ctrl->_scene_mgr->addCameraSceneNode(0, vector3df(0, 0 , 0), vector3df(0, 0, 1));
Expand Down
20 changes: 10 additions & 10 deletions Menu/SelectSkins.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ SelectSkins::SelectSkins(const std::shared_ptr<IrrlichtController> &ctrl, const
void SelectSkins::Init(void)
{
this->_background = this->_ctrl->_driver->getTexture(AssetSelector(BACKGROUND_SSS).c_str());
this->_first_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) - 155, HEIGHT - 110), GUI_ID_SKIN_WHITE_BUTTON, AssetSelector(FIRST_SKIN_SSS), AssetSelector(FIRST_SKIN_SSS));
this->_second_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) - 75, HEIGHT - 110), GUI_ID_SKIN_GREEN_BUTTON, AssetSelector(SECOND_SKIN_SSS), AssetSelector(SECOND_SKIN_SSS));
this->_third_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) + 5, HEIGHT - 110), GUI_ID_SKIN_BLUE_BUTTON, AssetSelector(THIRD_SKIN_SSS), AssetSelector(THIRD_SKIN_SSS));
this->_fourth_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) + 85, HEIGHT - 110), GUI_ID_SKIN_BLACK_BUTTON, AssetSelector(FOURTH_SKIN_SSS), AssetSelector(FOURTH_SKIN_SSS));
this->_first_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) - 75, HEIGHT - 110), GUI_ID_SKINS_WHITE_BUTTON, AssetSelector(FIRST_SKIN_SSS), AssetSelector(FIRST_SKIN_SSS));
this->_second_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) - 155, HEIGHT - 110), GUI_ID_SKINS_GREEN_BUTTON, AssetSelector(SECOND_SKIN_SSS), AssetSelector(SECOND_SKIN_SSS));
this->_third_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) + 5, HEIGHT - 110), GUI_ID_SKINS_BLUE_BUTTON, AssetSelector(THIRD_SKIN_SSS), AssetSelector(THIRD_SKIN_SSS));
this->_fourth_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) + 85, HEIGHT - 110), GUI_ID_SKINS_BLACK_BUTTON, AssetSelector(FOURTH_SKIN_SSS), AssetSelector(FOURTH_SKIN_SSS));
this->_first_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) - 155, HEIGHT - 110), GUI_ID_SKIN_WHITE_BUTTON, AssetSelector(FIRST_SKIN_SSS).string(), AssetSelector(FIRST_SKIN_SSS).string());
this->_second_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) - 75, HEIGHT - 110), GUI_ID_SKIN_GREEN_BUTTON, AssetSelector(SECOND_SKIN_SSS).string(), AssetSelector(SECOND_SKIN_SSS).string());
this->_third_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) + 5, HEIGHT - 110), GUI_ID_SKIN_BLUE_BUTTON, AssetSelector(THIRD_SKIN_SSS).string(), AssetSelector(THIRD_SKIN_SSS).string());
this->_fourth_skin_one = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>((WIDTH / 4) + 85, HEIGHT - 110), GUI_ID_SKIN_BLACK_BUTTON, AssetSelector(FOURTH_SKIN_SSS).string(), AssetSelector(FOURTH_SKIN_SSS).string());
this->_first_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) - 75, HEIGHT - 110), GUI_ID_SKINS_WHITE_BUTTON, AssetSelector(FIRST_SKIN_SSS).string(), AssetSelector(FIRST_SKIN_SSS).string());
this->_second_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) - 155, HEIGHT - 110), GUI_ID_SKINS_GREEN_BUTTON, AssetSelector(SECOND_SKIN_SSS).string(), AssetSelector(SECOND_SKIN_SSS).string());
this->_third_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) + 5, HEIGHT - 110), GUI_ID_SKINS_BLUE_BUTTON, AssetSelector(THIRD_SKIN_SSS).string(), AssetSelector(THIRD_SKIN_SSS).string());
this->_fourth_skin_two = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(70, 70), vector2d<int>(WIDTH - (WIDTH / 4) + 85, HEIGHT - 110), GUI_ID_SKINS_BLACK_BUTTON, AssetSelector(FOURTH_SKIN_SSS).string(), AssetSelector(FOURTH_SKIN_SSS).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, BUTTON_SOUND_SSS);
this->_buttonGo = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) - 75, HEIGHT - 160), GUI_ID_GO_BUTTON, AssetSelector(BUTTON_GO_SSS), AssetSelector(BUTTON_GO_DARK_SSS));
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) - 550, (HEIGHT / 2) - 300), GUI_ID_PLAY_BUTTON, AssetSelector(BUTTON_BACK_SSS), AssetSelector(BUTTON_BACK_DARK_SSS));
this->_buttonGo = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) - 75, HEIGHT - 160), GUI_ID_GO_BUTTON, AssetSelector(BUTTON_GO_SSS).string(), AssetSelector(BUTTON_GO_DARK_SSS).string());
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(150, 150), vector2d<int>((WIDTH / 2) - 550, (HEIGHT / 2) - 300), GUI_ID_PLAY_BUTTON, AssetSelector(BUTTON_BACK_SSS).string(), AssetSelector(BUTTON_BACK_DARK_SSS).string());

this->_current_skin1 = 0;
this->_current_skin2 = 0;
Expand Down
12 changes: 6 additions & 6 deletions Settings/PauseSettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ PauseSettings::PauseSettings(const std::shared_ptr<IrrlichtController> &ctrl, co
void PauseSettings::Init(void)
{
this->_background = this->_ctrl->_driver->getTexture(AssetSelector(BACKGROUND_PS).c_str());
this->_buttonPlus = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 50, (HEIGHT / 2) - 100), GUI_ID_PLUS_BUTTON, AssetSelector(BUTTON_PLUS_PS), AssetSelector(BUTTON_PLUS_BIG_PS));
this->_buttonMinus = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 150, (HEIGHT / 2) - 100), GUI_ID_MINUS_BUTTON, AssetSelector(BUTTON_MINUS_PS), AssetSelector(BUTTON_MINUS_BIG_PS));
this->_buttonPlusSound = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 50, (HEIGHT / 2) + 100), GUI_ID_PLUS_BUTTON_SOUND, AssetSelector(BUTTON_PLUS_PS), AssetSelector(BUTTON_PLUS_BIG_PS));
this->_buttonMinusSound = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 150, (HEIGHT / 2) + 100), GUI_ID_MINUS_BUTTON_SOUND, AssetSelector(BUTTON_MINUS_PS), AssetSelector(BUTTON_MINUS_BIG_PS));
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 200, HEIGHT / 2 + 230), GUI_ID_BACK_BUTTON_SETTINGS, AssetSelector(BUTTON_BACK_PS), AssetSelector(BUTTON_BACK_DARK_PS));
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_PS));
this->_buttonPlus = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 50, (HEIGHT / 2) - 100), GUI_ID_PLUS_BUTTON, AssetSelector(BUTTON_PLUS_PS).string(), AssetSelector(BUTTON_PLUS_BIG_PS).string());
this->_buttonMinus = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 150, (HEIGHT / 2) - 100), GUI_ID_MINUS_BUTTON, AssetSelector(BUTTON_MINUS_PS).string(), AssetSelector(BUTTON_MINUS_BIG_PS).string());
this->_buttonPlusSound = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) + 50, (HEIGHT / 2) + 100), GUI_ID_PLUS_BUTTON_SOUND, AssetSelector(BUTTON_PLUS_PS).string(), AssetSelector(BUTTON_PLUS_BIG_PS).string());
this->_buttonMinusSound = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(100, 100), vector2d<int>((WIDTH / 2) - 150, (HEIGHT / 2) + 100), GUI_ID_MINUS_BUTTON_SOUND, AssetSelector(BUTTON_MINUS_PS).string(), AssetSelector(BUTTON_MINUS_BIG_PS).string());
this->_buttonBack = std::make_unique<Button>(this->_ctrl->_device, vector2d<int>(400, 100), vector2d<int>(WIDTH / 2 - 200, HEIGHT / 2 + 230), GUI_ID_BACK_BUTTON_SETTINGS, AssetSelector(BUTTON_BACK_PS).string(), AssetSelector(BUTTON_BACK_DARK_PS).string());
this->_buttonSound = std::make_unique<Sound>(this->_ctrl->_context, AssetSelector(BUTTON_SOUND_PS).string());
}

void PauseSettings::Update(void)
Expand Down
Loading

0 comments on commit b19d948

Please sign in to comment.