Skip to content
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

Fixed breaking changes #41

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Fixed breaking changes #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions src/main/java/project/app/warzone/Model/Postload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@ public void saveMap(String p_filename) {
ge.setPhase(new PlaySetup(ge));
}

/**
* @param p_fileName filename
*/
public void validateMap() {
printInvalidCommandMessage();
}

public void saveMap(String p_filename) {
// Call savemap func after creation of it
ge.setPhase(new PlaySetup(ge));
}

public void showMap(MapFeatures newmapFeatures) {
LogObject l_logObject = new LogObject();
l_logObject.setD_command("showmap");
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/project/app/warzone/Features/CardTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,10 @@ public void testBombCountry() {
public void testNegotiatedPlayer() {

d_playerFeatures.assignCountries(d_gameEngine);
MapFeatures mapFeatures = MapFeatures.getInstance();

d_gameEngine.getGamePhase().loadMap("europe");
d_gameEngine.getGamePhase().showMap();
d_gameEngine.getGamePhase().showMap(mapFeatures);
d_gameEngine.getGamePhase().setPlayers("add", "rochelle");
d_gameEngine.getGamePhase().setPlayers("add", "numan");
d_gameEngine.getGamePhase().assignCountriesForDemo();
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/project/app/warzone/Model/AttackOrderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,10 @@ public void testAttackonNegotiatedCountry() {

d_playerFeatures.assignCountries(d_gameEngine);
LogObject l_logObject = new LogObject();
MapFeatures mapFeatures= MapFeatures.getInstance();

d_gameEngine.getGamePhase().loadMap("europe");
d_gameEngine.getGamePhase().showMap();
d_gameEngine.getGamePhase().showMap(mapFeatures);
d_gameEngine.getGamePhase().setPlayers("add","rochelle");
d_gameEngine.getGamePhase().setPlayers("add","numan");
d_gameEngine.getGamePhase().assignCountriesForDemo();
Expand Down
Loading