Skip to content

Multiplayer1 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coder111111 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Multiplayer1 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38bff5f
Separation between UI and model. Start new game now works headless. P…
coder111111 May 30, 2020
559b3fb
Potential serialization issue fix for GameSession listener list.
coder111111 Jun 3, 2020
23c5c5b
Merge branch 'master' into multiplayer1
coder111111 Jun 3, 2020
7931a43
Fix the "continue" problem. Make sure UI always registers itself as a…
coder111111 Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/rotp/Rotp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ public void windowClosing(WindowEvent e) {

setFrameSize();

if (reloadRecentSave)
if (reloadRecentSave) {
RotPUI.instance().unregisterOnSession(GameSession.instance());
GameSession.instance().loadRecentSession(false);
RotPUI.instance().registerOnSession(GameSession.instance());
}
frame.setResizable(false);
frame.setVisible(true);
}
Expand Down
3 changes: 3 additions & 0 deletions src/rotp/ui/RotPUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,9 @@ public final void registerOnSession(GameSession gameSession) {
gameSession.removeGameListener(this);
gameSession.addGameListener(this);
}
public final void unregisterOnSession(GameSession gameSession) {
gameSession.removeGameListener(this);
}
@Override
public void clearAdvice() {
RotPUI.this.mainUI().clearAdvice();
Expand Down
5 changes: 4 additions & 1 deletion src/rotp/ui/game/GameUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,11 @@ private void openRedditPage() {
public void continueGame() {
if (canContinue()) {
buttonClick();
if (!session().status().inProgress())
if (!session().status().inProgress()) {
RotPUI.instance().unregisterOnSession(session());
session().loadRecentSession(true);
RotPUI.instance().registerOnSession(session());
}
RotPUI.instance().selectMainPanel();
}
}
Expand Down
7 changes: 6 additions & 1 deletion src/rotp/ui/game/LoadGameUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,11 @@ public void loadRecentGame() {
loading = true;
repaint();
buttonClick();
final Runnable load = () -> { GameSession.instance().loadRecentSession(false); };
final Runnable load = () -> {
RotPUI.instance().unregisterOnSession(session());
GameSession.instance().loadRecentSession(false);
RotPUI.instance().registerOnSession(session());
};
SwingUtilities.invokeLater(load);
}
public void loadGame(String s) {
Expand All @@ -248,6 +252,7 @@ public void loadGame(String s) {
repaint();
buttonClick();
final Runnable load = () -> {
RotPUI.instance().unregisterOnSession(session());
GameSession.instance().loadSession(s, false);
RotPUI.instance().registerOnSession(session());
};
Expand Down