From 768ed2207c009da9011e0199f8034a2edcd6fddb Mon Sep 17 00:00:00 2001 From: devZoGok Date: Mon, 1 Nov 2021 19:53:17 +0200 Subject: [PATCH] updated button signatures --- activeGameState.cpp | 4 ++-- exitButton.cpp | 4 +++- inGameAppState.cpp | 12 ++++++------ main.cpp | 3 +-- optionsButton.cpp | 10 +++++----- util.cpp | 9 +++++---- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/activeGameState.cpp b/activeGameState.cpp index ea8e635..5f09df2 100755 --- a/activeGameState.cpp +++ b/activeGameState.cpp @@ -27,7 +27,7 @@ namespace battleship{ const int size = 50; - ActiveGameState::UnitButton::UnitButton(ActiveGameState *activeState, Vector2 pos, Vector2 size, std::string name,int faction,int unitId) : vb01Gui::Button(pos,size,name,true){ + ActiveGameState::UnitButton::UnitButton(ActiveGameState *activeState, Vector2 pos, Vector2 size, std::string name,int faction,int unitId) : vb01Gui::Button(pos, size, name, "", -1, true){ this->activeState=activeState; this->faction=faction; this->unitId=unitId; @@ -78,7 +78,7 @@ namespace battleship{ */ } - ActiveGameState::UnitActionButton::UnitActionButton(unitData::UNIT_TYPE type, Vector2 pos, Vector2 size, string name, string path) : vb01Gui::Button(pos,size,name,true){ + ActiveGameState::UnitActionButton::UnitActionButton(unitData::UNIT_TYPE type, Vector2 pos, Vector2 size, string name, string path) : vb01Gui::Button(pos, size, name, "", -1, true){ this->type=type; GameManager *gm = GameManager::getSingleton(); activeState=((ActiveGameState*)gm->getStateManager()->getAppState(AppStateTypes::ACTIVE_STATE)); diff --git a/exitButton.cpp b/exitButton.cpp index e294cd2..a9db5e7 100755 --- a/exitButton.cpp +++ b/exitButton.cpp @@ -1,11 +1,13 @@ #include "exitButton.h" +#include "defConfigs.h" + #include using namespace std; using namespace vb01; namespace battleship{ - ExitButton::ExitButton(Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + ExitButton::ExitButton(Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, configData::PATH + "Fonts/batang.ttf", -1, separate) { } void ExitButton::onClick() { diff --git a/inGameAppState.cpp b/inGameAppState.cpp index 4828c7b..ab4ad12 100755 --- a/inGameAppState.cpp +++ b/inGameAppState.cpp @@ -14,7 +14,7 @@ using namespace std; namespace battleship{ using namespace configData; - InGameAppState::ResumeButton::ResumeButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + InGameAppState::ResumeButton::ResumeButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->guiState = guiState; this->inGameState = inGameState; } @@ -27,7 +27,7 @@ namespace battleship{ return guiState; } - InGameAppState::ConsoleButton::ConsoleButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + InGameAppState::ConsoleButton::ConsoleButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->guiState = guiState; this->inGameState = inGameState; } @@ -37,7 +37,7 @@ namespace battleship{ class ConsoleCommandEntryButton : public Button { public: - ConsoleCommandEntryButton(InGameAppState *inGameState, Textbox *t, Listbox *l, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + ConsoleCommandEntryButton(InGameAppState *inGameState, Textbox *t, Listbox *l, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->inGameState = inGameState; textbox = t; listbox = l; @@ -97,7 +97,7 @@ namespace battleship{ guiState->addButton(entryButton); } - InGameAppState::InGameOptionsButton::ReturnButton::ReturnButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + InGameAppState::InGameOptionsButton::ReturnButton::ReturnButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->guiState = guiState; this->inGameState = inGameState; } @@ -146,7 +146,7 @@ namespace battleship{ OptionsButton::onClick(); } - InGameAppState::MainMenuButton::MainMenuButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + InGameAppState::MainMenuButton::MainMenuButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->guiState = guiState; this->inGameState = inGameState; } @@ -155,7 +155,7 @@ namespace battleship{ } - InGameAppState::UnitCreationButton::UnitCreationButton(string icon, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + InGameAppState::UnitCreationButton::UnitCreationButton(string icon, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { //setImageButton(new Image(icon, pos, size)); } diff --git a/main.cpp b/main.cpp index fe4010a..4c8bfed 100755 --- a/main.cpp +++ b/main.cpp @@ -8,11 +8,10 @@ using namespace battleship; int main() { GameManager *gameManager = GameManager::getSingleton(); gameManager->start(); - /* GuiAppState *state = new GuiAppState(); gameManager->getStateManager()->attachState(state); makeTitlescreenButtons(state); - */ + while(true){ gameManager->update(); } diff --git a/optionsButton.cpp b/optionsButton.cpp index bdd9bad..c6123d4 100755 --- a/optionsButton.cpp +++ b/optionsButton.cpp @@ -9,21 +9,21 @@ using namespace std; namespace battleship{ using namespace configData; - OptionsButton::OkButton::OkButton() : Button(Vector2(50, GameManager::getSingleton()->getHeight() - 150), Vector2(140, 50), "Ok", true) { + OptionsButton::OkButton::OkButton() : Button(Vector2(50, GameManager::getSingleton()->getHeight() - 150), Vector2(140, 50), "Ok", PATH + "Fonts/batang.ttf", -1, true) { this->state = ((GuiAppState*)GameManager::getSingleton()->getStateManager()->getAppState(AppStateTypes::GUI_STATE)); } void OptionsButton::OkButton::onClick() { } - OptionsButton::DefaultsButton::DefaultsButton() : Button(Vector2(200, GameManager::getSingleton()->getHeight() - 150), Vector2(140, 50), "Restore defaults", true) { + OptionsButton::DefaultsButton::DefaultsButton() : Button(Vector2(200, GameManager::getSingleton()->getHeight() - 150), Vector2(140, 50), "Restore defaults", PATH + "Fonts/batang.ttf", -1, true) { this->state = ((GuiAppState*)GameManager::getSingleton()->getStateManager()->getAppState(AppStateTypes::GUI_STATE)); } void OptionsButton::DefaultsButton::onClick() { } - OptionsButton::BackButton::BackButton() : Button(Vector2(350, GameManager::getSingleton()->getHeight() - 150), Vector2(140, 50), "Back", true) { + OptionsButton::BackButton::BackButton() : Button(Vector2(350, GameManager::getSingleton()->getHeight() - 150), Vector2(140, 50), "Back", PATH + "Fonts/batang.ttf", -1, true) { this->state = ((GuiAppState*)GameManager::getSingleton()->getStateManager()->getAppState(AppStateTypes::GUI_STATE)); } void OptionsButton::BackButton::onClick() { @@ -43,7 +43,7 @@ namespace battleship{ state->removeButton("Back"); } - OptionsButton::TabButton::TabButton(Vector2 pos, Vector2 size, string name) :Button(pos, size, name, true) { + OptionsButton::TabButton::TabButton(Vector2 pos, Vector2 size, string name) :Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, true) { this->state = ((GuiAppState*)GameManager::getSingleton()->getStateManager()->getAppState(AppStateTypes::GUI_STATE)); } void OptionsButton::TabButton::onClick() { @@ -198,7 +198,7 @@ namespace battleship{ state->removeButton("Multiplayer"); } - OptionsButton::OptionsButton(Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + OptionsButton::OptionsButton(Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->state = ((GuiAppState*)GameManager::getSingleton()->getStateManager()->getAppState(AppStateTypes::GUI_STATE)); } void OptionsButton::onClick() { diff --git a/util.cpp b/util.cpp index 6191ed5..fb4a3ec 100755 --- a/util.cpp +++ b/util.cpp @@ -18,7 +18,7 @@ namespace battleship{ class SpButton : public Button { public: - SpButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + SpButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->state = state; } @@ -27,7 +27,7 @@ namespace battleship{ class PlayButton : public Button { public: - PlayButton(Listbox **difficulties, Listbox **factions, int lengths[2], Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + PlayButton(Listbox **difficulties, Listbox **factions, int lengths[2], Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->state = ((GuiAppState*)GameManager::getSingleton()->getStateManager()->getAppState(AppStateTypes::GUI_STATE)); this->lengths[0]=lengths[0]; this->lengths[1]=lengths[1]; @@ -66,7 +66,7 @@ namespace battleship{ class ReturnButton : public Button { public: - ReturnButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + ReturnButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->state = state; } @@ -143,7 +143,7 @@ namespace battleship{ class ReturnButton : public Button { public: - ReturnButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, separate) { + ReturnButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, PATH + "Fonts/batang.ttf", -1, separate) { this->state = state; } @@ -172,6 +172,7 @@ namespace battleship{ }; GameManager *gm = GameManager::getSingleton(); + string font = PATH + "Fonts/batang.ttf"; SpButton *spButton = new SpButton(state, Vector2(gm->getWidth() / 16, gm->getHeight() / 12), Vector2(150, 40), "Singleplayer", true); MainMenuOptionsButton *optionsButton = new MainMenuOptionsButton(state, Vector2(gm->getWidth() / 16, gm->getHeight() / 12 * 2), Vector2(150, 40), "Options", true); ExitButton *exitButton = new ExitButton(Vector2(gm->getWidth() / 16, gm->getHeight() / 12 * 3), Vector2(150, 40), "Exit", true);