summaryrefslogtreecommitdiff
path: root/engine/Engine.java
diff options
context:
space:
mode:
Diffstat (limited to 'engine/Engine.java')
-rw-r--r--engine/Engine.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/Engine.java b/engine/Engine.java
index eec7b73..6a8773d 100644
--- a/engine/Engine.java
+++ b/engine/Engine.java
@@ -4,6 +4,7 @@ import mahjong.aux.Card;
import mahjong.aux.set.Aside;
import mahjong.aux.set.Set;
import mahjong.player.GenericPlayer;
+import mahjong.player.PlayerActionServer;
import mahjong.tools.Deck;
import java.util.Random;
@@ -12,10 +13,10 @@ import java.util.Random;
* Created by joe on 12/2/14.
*/
public class Engine {
- GenericPlayer[] players=new GenericPlayer[4];
+ PlayerActionServer[] players=new PlayerActionServer[4];
Set deck;
- public Engine(GenericPlayer player1,GenericPlayer player2,GenericPlayer player3,GenericPlayer player4)
+ public Engine(PlayerActionServer player1,PlayerActionServer player2,PlayerActionServer player3,PlayerActionServer player4)
{
players[0]=player1;
players[1]=player2;
@@ -30,7 +31,7 @@ public class Engine {
for (int i=0;i<5;++i) {
int x = rand.nextInt(4);
int y = (x+rand.nextInt(3)+1)%4;
- GenericPlayer tmp;
+ PlayerActionServer tmp;
tmp=players[x];
players[x]=players[y];
players[y]=tmp;
@@ -42,7 +43,7 @@ public class Engine {
ShufflePlayer();
for (int i=0;i<4;++i)
System.out.println(players[i].getName());
- deck = Deck.generateDeck();
+ deck = Deck.generateDeck(true);
}
public static void playerPutAsideCards(GenericPlayer player, Card card, Aside aside)
@@ -63,7 +64,7 @@ public class Engine {
while (!hu && deck.getSize()>0)
{
Card card=deck.draw();
- GenericPlayer player=players[pos];
+ PlayerActionServer player=players[pos];
// Hu
if (player.hand.huAble(card)) {