commented out code

This commit is contained in:
devZoGok
2023-06-25 10:34:31 +03:00
parent efcefdbf8e
commit e4a937683f
4 changed files with 18 additions and 2 deletions
+9 -1
View File
@@ -42,6 +42,7 @@ namespace battleship{
}
void InGameAppState::ConsoleButton::onClick() {
/*
vector<string> list;
int emptyEntries = 20;
@@ -76,6 +77,7 @@ namespace battleship{
true
);
guiState->addButton(entryButton);
*/
}
InGameAppState::ConsoleButton::ConsoleButton::ConsoleCommandEntryButton::ConsoleCommandEntryButton(InGameAppState *inGameState, Textbox *t, Listbox *l, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, GameManager::getSingleton()->getPath() + "Fonts/batang.ttf", -1, separate) {
@@ -95,6 +97,7 @@ namespace battleship{
//TODO: replace string literals removeButton() lines
void InGameAppState::InGameOptionsButton::ReturnButton::onClick() {
/*
guiState->removeAllCheckboxes();
guiState->removeAllListboxes();
guiState->removeAllSliders();
@@ -125,6 +128,7 @@ namespace battleship{
guiState->addButton(exitButton);
guiState->removeButton("Back");
*/
}
InGameAppState::InGameOptionsButton::InGameOptionsButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size) : OptionsButton(pos, size, "Options", true) {
@@ -133,6 +137,7 @@ namespace battleship{
}
void InGameAppState::InGameOptionsButton::onClick() {
/*
returnButton = new ReturnButton(guiState, inGameState, Vector2(50, GameManager::getSingleton()->getHeight() - 150), Vector2(150, 50), "Back", true);
guiState->addButton(returnButton);
guiState->removeButton(inGameState->getResumeButton());
@@ -140,6 +145,7 @@ namespace battleship{
guiState->removeButton(inGameState->getMainMenuButton());
guiState->removeButton(inGameState->getExitButton());
OptionsButton::onClick();
*/
}
InGameAppState::MainMenuButton::MainMenuButton(GuiAppState *guiState, InGameAppState *inGameState, Vector2 pos, Vector2 size) : Button(pos, size, "Main menu", GameManager::getSingleton()->getPath() + "Fonts/batang.ttf", -1, true) {
@@ -212,7 +218,7 @@ namespace battleship{
void InGameAppState::toggleMainMenu() {
GameManager *gm = GameManager::getSingleton();
/*
if (!isMainMenuActive) {
isMainMenuActive = true;
gm->getStateManager()->dettachAppState(activeState);
@@ -250,6 +256,8 @@ namespace battleship{
for(Unit *u : p->getUnits())
u->reinitUnit();
}
*/
}
void InGameAppState::onAction(int bind, bool isPressed) {
+2
View File
@@ -199,6 +199,7 @@ namespace battleship{
}
void MapEditorAppState::MapEditor::prepareGui(){
/*
GameManager *gm = GameManager::getSingleton();
StateManager *sm = gm->getStateManager();
GuiAppState *state = (GuiAppState*)sm->getAppStateByType((int)AppStateType::GUI_STATE);
@@ -287,6 +288,7 @@ namespace battleship{
vector<string> landTextures = readDir(gm->getPath() + "Textures/Landmass", false);
LandTexListbox *landTexListbox = new LandTexListbox(startPos + 4 * offset, size, landTextures, (landTextures.size() > maxDisplay ? maxDisplay : landTextures.size()), fontPath);
state->addListbox(landTexListbox);
*/
}
void MapEditorAppState::MapEditor::prepareTextures(string basePath, bool skybox, vector<Texture*> &textures){
+5 -1
View File
@@ -12,6 +12,7 @@ namespace battleship{
using namespace gameBase;
void MapEditorButton::onClick(){
/*
class NewMapButton : public Button{
public:
NewMapButton(Vector2 pos, Vector2 size) : Button(pos, size, "New map", GameManager::getSingleton()->getPath() + "Fonts/batang.ttf"){}
@@ -64,7 +65,6 @@ namespace battleship{
}
private:
};
class LoadMapButton : public Button{
public:
LoadMapButton(Vector2 pos, Vector2 size) : Button(pos, size, "Load map", GameManager::getSingleton()->getPath() + "Fonts/batang.ttf"){}
@@ -107,7 +107,10 @@ namespace battleship{
}
private:
};
*/
/*
GameManager *gm = GameManager::getSingleton();
GuiAppState *guiState = (GuiAppState*)gm->getStateManager()->getAppStateByType((int)AppStateType::GUI_STATE);
guiState->removeAllButtons(vector<Button*>{this});
@@ -120,5 +123,6 @@ namespace battleship{
guiState->addButton(newMapButton);
guiState->addButton(loadMapButton);
guiState->removeButton(this);
*/
}
}
+2
View File
@@ -29,6 +29,7 @@ namespace battleship{
using namespace configData;
void makeTitlescreenButtons(GuiAppState *state) {
/*
class SpButton : public Button {
public:
SpButton(GuiAppState *state, Vector2 pos, Vector2 size, string name, bool separate) : Button(pos, size, name, GameManager::getSingleton()->getPath() + "Fonts/batang.ttf", GLFW_KEY_S, separate) {
@@ -220,6 +221,7 @@ namespace battleship{
state->addButton(optionsButton);
state->addButton(editorButton);
state->addButton(exitButton);
*/
}
vector<string> readDir(string path, bool findFolders){