Start work on players!

1 files changed, 6 insertions, 12 deletions

diff --git a/judge/dummy_game.ml b/judge/dummy_game.ml
index 1e72682..4ac4eac 100644
--- a/judge/dummy_game.ml
+++ b/judge/dummy_game.ml
@@ -1,16 +1,15 @@
 open Core
 open Main
 
-module Dummy : GAME = struct
+module G : GAME = struct
 
   type game = int * (player * string) list * game_status
 
   let new_game = (10, [], TurnOf P1)
 
-  let play (g, l, s0) p xx =
-    if s0 <> TurnOf p || g <= 0 then
-      (g, l, Eliminated p)
-    else
+  let play (g, l, s0) xx =
+    match s0 with
+    | TurnOf p when g > 0 ->
       let op = other_player p in
       (g-1, l@[p, xx], 
         if g - 1 = 0 then
@@ -21,6 +20,8 @@ module Dummy : GAME = struct
         else
           TurnOf op
       )
+    | TurnOf x -> (g, l, Eliminated x)
+    | _ -> raise (Eliminated_ex "not someone's turn!")
 
   let s (_, _, s) = s
 
@@ -46,10 +47,3 @@ module Dummy : GAME = struct
   let name = "Dummy game for testing purposes"
 
 end
-
-module C = Core(Dummy)
-module Main = Juge(C)
-
-let () =
-  Random.self_init ();
-  Main.run ()