Load the game on double click on the loading menu
This commit is contained in:
parent
b9ac40d3d9
commit
02478ea3bc
|
@ -227,6 +227,16 @@ void MainMenu::mouseDownLeft(int x, int y){
|
||||||
state->mouseClick(x, y, mbLeft);
|
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){
|
void MainMenu::mouseDownRight(int x, int y){
|
||||||
if(GraphicComponent::getFade()<0.2f) return;
|
if(GraphicComponent::getFade()<0.2f) return;
|
||||||
state->mouseClick(x, y, mbRight);
|
state->mouseClick(x, y, mbRight);
|
||||||
|
|
|
@ -74,6 +74,8 @@ public:
|
||||||
virtual void mouseMove(int x, int y, const MouseState *mouseState);
|
virtual void mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
virtual void eventMouseWheel(int x, int y,int zDelta);
|
virtual void eventMouseWheel(int x, int y,int zDelta);
|
||||||
virtual void mouseDownLeft(int x, int y);
|
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 mouseDownRight(int x, int y);
|
||||||
virtual void mouseUpLeft(int x, int y);
|
virtual void mouseUpLeft(int x, int y);
|
||||||
virtual bool textInput(std::string text);
|
virtual bool textInput(std::string text);
|
||||||
|
@ -119,6 +121,7 @@ public:
|
||||||
MenuState(Program *program, MainMenu *mainMenu, const string &stateName);
|
MenuState(Program *program, MainMenu *mainMenu, const string &stateName);
|
||||||
virtual ~MenuState();
|
virtual ~MenuState();
|
||||||
virtual void mouseClick(int x, int y, MouseButton mouseButton)=0;
|
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 mouseUp(int x, int y, const MouseButton mouseButton){};
|
||||||
virtual void mouseMove(int x, int y, const MouseState *mouseState)=0;
|
virtual void mouseMove(int x, int y, const MouseState *mouseState)=0;
|
||||||
virtual void eventMouseWheel(int x, int y, int zDelta){};
|
virtual void eventMouseWheel(int x, int y, int zDelta){};
|
||||||
|
|
|
@ -59,6 +59,7 @@ public:
|
||||||
virtual ~MenuStateAbout();
|
virtual ~MenuStateAbout();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
virtual void keyDown(SDL_KeyboardEvent key);
|
virtual void keyDown(SDL_KeyboardEvent key);
|
||||||
|
|
|
@ -266,6 +266,7 @@ public:
|
||||||
virtual ~MenuStateConnectedGame();
|
virtual ~MenuStateConnectedGame();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void eventMouseWheel(int x, int y,int zDelta);
|
void eventMouseWheel(int x, int y,int zDelta);
|
||||||
void render();
|
void render();
|
||||||
|
|
|
@ -245,6 +245,7 @@ public:
|
||||||
virtual ~MenuStateCustomGame();
|
virtual ~MenuStateCustomGame();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void eventMouseWheel(int x, int y,int zDelta);
|
void eventMouseWheel(int x, int y,int zDelta);
|
||||||
void render();
|
void render();
|
||||||
|
|
|
@ -38,6 +38,7 @@ public:
|
||||||
MenuStateGraphicInfo(Program *program, MainMenu *mainMenu);
|
MenuStateGraphicInfo(Program *program, MainMenu *mainMenu);
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
virtual void keyDown(SDL_KeyboardEvent key);
|
virtual void keyDown(SDL_KeyboardEvent key);
|
||||||
|
|
|
@ -76,6 +76,7 @@ public:
|
||||||
virtual ~MenuStateJoinGame();
|
virtual ~MenuStateJoinGame();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
void update();
|
void update();
|
||||||
|
|
|
@ -70,6 +70,7 @@ public:
|
||||||
virtual ~MenuStateKeysetup();
|
virtual ~MenuStateKeysetup();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseUp(int x, int y, const MouseButton mouseButton);
|
||||||
void mouseMove(int x, int y, const MouseState *mouseState);
|
void mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void update();
|
void update();
|
||||||
|
|
|
@ -189,6 +189,12 @@ void MenuStateLoadGame::reloadUI() {
|
||||||
GraphicComponent::reloadFontsForRegisterGraphicComponents(containerName);
|
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){
|
void MenuStateLoadGame::mouseClick(int x, int y, MouseButton mouseButton){
|
||||||
|
|
||||||
CoreData &coreData= CoreData::getInstance();
|
CoreData &coreData= CoreData::getInstance();
|
||||||
|
|
|
@ -56,6 +56,7 @@ public:
|
||||||
~MenuStateLoadGame();
|
~MenuStateLoadGame();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseUp(int x, int y, const MouseButton mouseButton);
|
||||||
void mouseMove(int x, int y, const MouseState *mouseState);
|
void mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void update();
|
void update();
|
||||||
|
|
|
@ -117,6 +117,7 @@ public:
|
||||||
~MenuStateMasterserver();
|
~MenuStateMasterserver();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseUp(int x, int y, const MouseButton mouseButton);
|
||||||
void mouseMove(int x, int y, const MouseState *mouseState);
|
void mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void update();
|
void update();
|
||||||
|
|
|
@ -188,6 +188,7 @@ public:
|
||||||
virtual ~MenuStateMods();
|
virtual ~MenuStateMods();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseUp(int x, int y, const MouseButton mouseButton);
|
||||||
void mouseMove(int x, int y, const MouseState *mouseState);
|
void mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void eventMouseWheel(int x, int y,int zDelta);
|
void eventMouseWheel(int x, int y,int zDelta);
|
||||||
|
|
|
@ -34,6 +34,7 @@ public:
|
||||||
MenuStateNewGame(Program *program, MainMenu *mainMenu);
|
MenuStateNewGame(Program *program, MainMenu *mainMenu);
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void update();
|
void update();
|
||||||
void render();
|
void render();
|
||||||
|
|
|
@ -94,6 +94,7 @@ public:
|
||||||
virtual ~MenuStateOptions();
|
virtual ~MenuStateOptions();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
virtual bool textInput(std::string text);
|
virtual bool textInput(std::string text);
|
||||||
|
|
|
@ -99,6 +99,7 @@ public:
|
||||||
MenuStateOptionsGraphics(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
|
MenuStateOptionsGraphics(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
//virtual void keyDown(SDL_KeyboardEvent key);
|
//virtual void keyDown(SDL_KeyboardEvent key);
|
||||||
|
|
|
@ -70,6 +70,7 @@ public:
|
||||||
MenuStateOptionsNetwork(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
|
MenuStateOptionsNetwork(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
//virtual void keyDown(SDL_KeyboardEvent key);
|
//virtual void keyDown(SDL_KeyboardEvent key);
|
||||||
|
|
|
@ -54,6 +54,7 @@ public:
|
||||||
MenuStateOptionsSound(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
|
MenuStateOptionsSound(Program *program, MainMenu *mainMenu, ProgramState **parentUI=NULL);
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
//virtual void keyDown(SDL_KeyboardEvent key);
|
//virtual void keyDown(SDL_KeyboardEvent key);
|
||||||
|
|
|
@ -62,6 +62,7 @@ public:
|
||||||
virtual ~MenuStateRoot();
|
virtual ~MenuStateRoot();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void render();
|
void render();
|
||||||
void update();
|
void update();
|
||||||
|
|
|
@ -56,6 +56,7 @@ public:
|
||||||
virtual ~MenuStateScenario();
|
virtual ~MenuStateScenario();
|
||||||
|
|
||||||
void mouseClick(int x, int y, MouseButton mouseButton);
|
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 mouseMove(int x, int y, const MouseState *mouseState);
|
||||||
void eventMouseWheel(int x, int y,int zDelta);
|
void eventMouseWheel(int x, int y,int zDelta);
|
||||||
void render();
|
void render();
|
||||||
|
|
Loading…
Reference in New Issue