Skip to content
Snippets Groups Projects
Commit e4360344 authored by marcus's avatar marcus
Browse files

coupled mainmenu with joingame

parent 30e445ee
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,8 @@ import com.badlogic.gdx.math.Vector3; ...@@ -7,6 +7,8 @@ import com.badlogic.gdx.math.Vector3;
import com.wordbattle.game.states.CreateGameState; import com.wordbattle.game.states.CreateGameState;
import com.wordbattle.game.states.JoinGameState; import com.wordbattle.game.states.JoinGameState;
import com.wordbattle.game.states.MainMenuState; import com.wordbattle.game.states.MainMenuState;
import com.wordbattle.game.states.StartingGameState;
import com.wordbattle.game.states.WaitingLobbyState;
import com.wordbattle.game.view.JoinGameView; import com.wordbattle.game.view.JoinGameView;
import com.wordbattle.game.view.MainMenuView; import com.wordbattle.game.view.MainMenuView;
...@@ -33,7 +35,7 @@ public class JoinGameController { ...@@ -33,7 +35,7 @@ public class JoinGameController {
if (joinGameButtonBounds.contains(touchPos.x, touchPos.y)) { if (joinGameButtonBounds.contains(touchPos.x, touchPos.y)) {
System.out.println("Join Game Button Pressed"); System.out.println("Join Game Button Pressed");
if (confirmNickname() && confirmPin()){ if (confirmNickname() && confirmPin()){
state.getStateManager().setState(new CreateGameState(state.getStateManager()));//needs to be changed to lobbyState when it is ready state.getStateManager().setState(new StartingGameState(state.getStateManager()));//needs to be changed to lobbyState when it is ready
} }
......
...@@ -10,6 +10,7 @@ import com.wordbattle.game.states.CreateGameState; ...@@ -10,6 +10,7 @@ import com.wordbattle.game.states.CreateGameState;
import com.wordbattle.game.states.JoinGameState; import com.wordbattle.game.states.JoinGameState;
import com.wordbattle.game.states.MainMenuState; import com.wordbattle.game.states.MainMenuState;
import com.wordbattle.game.states.StartState; import com.wordbattle.game.states.StartState;
import com.wordbattle.game.states.StartingGameState;
import com.wordbattle.game.states.StateManager; import com.wordbattle.game.states.StateManager;
import com.wordbattle.game.view.MainMenuView; import com.wordbattle.game.view.MainMenuView;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment