clock: User swap to other position

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/clock.rs b/src/clock.rs
index 8250a2c90621ad39b3271d4084afa0ae4c5d869d..632cd22702db22be21b3940b81b7f6d71f1bceba 100644 (file)
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -430,12 +430,11 @@ impl PieceTrait for Clock {
         if let Some(_gpl) = gs.players.get(state.users[user].player) {
           throw!(OE::BadPieceStateForOperation);
         }
+        state.users[user].player = player;
         if state.users[! user].player == player {
-          // todo: some more useful per-player message
-          // xxx: actually, clear us from the other player instead ?
-          throw!(OE::BadPieceStateForOperation);
+          // OK, you want to swap
+          state.users[! user].player = default();
         }
-        state.users[user].player = player;
       },
       "unclaim-x" | "unclaim-y" => { // xxx these need to be Unpredictable
         let user = get_user();