Load the game on double click on the loading menu

This commit is contained in:
Rampoina 2022-08-09 21:04:43 +02:00
parent b9ac40d3d9
commit 02478ea3bc
19 changed files with 35 additions and 0 deletions

View File

@ -227,6 +227,16 @@ void MainMenu::mouseDownLeft(int x, int y){
state->mouseClick(x, y, mbLeft);
}
void MainMenu::mouseDoubleClickLeft(int x, int y){
if(GraphicComponent::getFade()<0.2f) return;
state->mouseDoubleClick(x, y, mbLeft);
}
void MainMenu::mouseDoubleClickRight(int x, int y){
if(GraphicComponent::getFade()<0.2f) return;
state->mouseDoubleClick(x, y, mbRight);
}
void MainMenu::mouseDownRight(int x, int y){
if(GraphicComponent::getFade()<0.2f) return;
state->mouseClick(x, y, mbRight);

View File

@ -74,6 +74,8 @@ public:
virtual void mouseMove(int x, int y, const MouseState *mouseState);
virtual void eventMouseWheel(int x, int y,int zDelta);
virtual void mouseDownLeft(int x, int y);
virtual void mouseDoubleClickLeft(int x, int y);
virtual void mouseDoubleClickRight(int x, int y);
virtual void mouseDownRight(int x, int y);
virtual void mouseUpLeft(int x, int y);
virtual bool textInput(std::string text);
@ -119,6 +121,7 @@ public:
MenuState(Program *program, MainMenu *mainMenu, const string &stateName);
virtual ~MenuState();
virtual void mouseClick(int x, int y, MouseButton mouseButton)=0;
virtual void mouseDoubleClick(int x, int y, MouseButton mouseButton)=0;
virtual void mouseUp(int x, int y, const MouseButton mouseButton){};
virtual void mouseMove(int x, int y, const MouseState *mouseState)=0;
virtual void eventMouseWheel(int x, int y, int zDelta){};

View File

@ -59,6 +59,7 @@ public:
virtual ~MenuStateAbout();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
virtual void keyDown(SDL_KeyboardEvent key);

View File

@ -266,6 +266,7 @@ public:
virtual ~MenuStateConnectedGame();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void eventMouseWheel(int x, int y,int zDelta);
void render();

View File

@ -245,6 +245,7 @@ public:
virtual ~MenuStateCustomGame();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void eventMouseWheel(int x, int y,int zDelta);
void render();

View File

@ -38,6 +38,7 @@ public:
MenuStateGraphicInfo(Program *program, MainMenu *mainMenu);
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
virtual void keyDown(SDL_KeyboardEvent key);

View File

@ -76,6 +76,7 @@ public:
virtual ~MenuStateJoinGame();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
void update();

View File

@ -70,6 +70,7 @@ public:
virtual ~MenuStateKeysetup();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseUp(int x, int y, const MouseButton mouseButton);
void mouseMove(int x, int y, const MouseState *mouseState);
void update();

View File

@ -189,6 +189,12 @@ void MenuStateLoadGame::reloadUI() {
GraphicComponent::reloadFontsForRegisterGraphicComponents(containerName);
}
void MenuStateLoadGame::mouseDoubleClick(int x, int y, MouseButton mouseButton) {
if (mouseButton == mbLeft) {
slotsScrollBar.mouseDown(x, y);
mouseClick(loadButton.getX()+1, loadButton.getY()+1, mouseButton);
}
}
void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
CoreData &coreData= CoreData::getInstance();

View File

@ -56,6 +56,7 @@ public:
~MenuStateLoadGame();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton);
void mouseUp(int x, int y, const MouseButton mouseButton);
void mouseMove(int x, int y, const MouseState *mouseState);
void update();

View File

@ -117,6 +117,7 @@ public:
~MenuStateMasterserver();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseUp(int x, int y, const MouseButton mouseButton);
void mouseMove(int x, int y, const MouseState *mouseState);
void update();

View File

@ -188,6 +188,7 @@ public:
virtual ~MenuStateMods();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseUp(int x, int y, const MouseButton mouseButton);
void mouseMove(int x, int y, const MouseState *mouseState);
void eventMouseWheel(int x, int y,int zDelta);

View File

@ -34,6 +34,7 @@ public:
MenuStateNewGame(Program *program, MainMenu *mainMenu);
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void update();
void render();

View File

@ -94,6 +94,7 @@ public:
virtual ~MenuStateOptions();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
virtual bool textInput(std::string text);

View File

@ -99,6 +99,7 @@ public:
MenuStateOptionsGraphics(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
//virtual void keyDown(SDL_KeyboardEvent key);

View File

@ -70,6 +70,7 @@ public:
MenuStateOptionsNetwork(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
//virtual void keyDown(SDL_KeyboardEvent key);

View File

@ -54,6 +54,7 @@ public:
MenuStateOptionsSound(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
//virtual void keyDown(SDL_KeyboardEvent key);

View File

@ -62,6 +62,7 @@ public:
virtual ~MenuStateRoot();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void render();
void update();

View File

@ -56,6 +56,7 @@ public:
virtual ~MenuStateScenario();
void mouseClick(int x, int y, MouseButton mouseButton);
void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
void mouseMove(int x, int y, const MouseState *mouseState);
void eventMouseWheel(int x, int y,int zDelta);
void render();