stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

small merge fixes

Browse Source
This commit is contained in:
Ticho Hidding
2025-10-03 02:46:48 +02:00
parent c020269f6e
commit 3471ae54a5
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/toop/app/menu/MainMenu.java
View File

@@ -7,7 +7,6 @@ import org.toop.app.GameType;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import org.toop.app.menu.game.TicTacToeMenu;
import org.toop.framework.asset.ResourceManager; import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.LocalizationAsset; import org.toop.framework.asset.resources.LocalizationAsset;
import org.toop.framework.eventbus.EventFlow; import org.toop.framework.eventbus.EventFlow;

4
app/src/main/resources/assets/localization/localization.properties
View File

@@ -2,8 +2,8 @@
windowTitle=ISY Games Selector windowTitle=ISY Games Selector
# Main Menu buttons # Main Menu buttons
mainMenuSelectTicTacToe=Tic Tac Toe\u5426 mainMenuSelectTicTacToe=Tic Tac Toe
mainMenuSelectReversi=Reversi\u5426 mainMenuSelectReversi=Reversi
mainMenuSelectSudoku=Sudoku mainMenuSelectSudoku=Sudoku
mainMenuSelectBattleship=Battleship mainMenuSelectBattleship=Battleship
mainMenuSelectOther=Other mainMenuSelectOther=Other

5
game/src/main/java/org/toop/game/TurnBasedGame.java
View File

@@ -6,10 +6,9 @@ public abstract class TurnBasedGame extends Game {
protected int currentTurn; protected int currentTurn;
protected TurnBasedGame(int rowSize, int columnSize, int turns) { protected TurnBasedGame(int rowSize, int columnSize, int turns) {
assert turns >= 2;
super(rowSize, columnSize); super(rowSize, columnSize);
this.turns = turns; assert turns >= 2;
this.turns = turns;
} }
protected TurnBasedGame(TurnBasedGame other) { protected TurnBasedGame(TurnBasedGame other) {