From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 13 Jul 2021 14:29:33 +0000 (+0100)
Subject: errors: hand, deck: Use BadUiOperation for confusing conflicts
X-Git-Tag: otter-0.7.2~117
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=28bef8fe94fd25373ef70424cddc7fba6e9b3ee5;p=otter.git

errors: hand, deck: Use BadUiOperation for confusing conflicts

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

diff --git a/src/deck.rs b/src/deck.rs
index 48bbcbed..0e12afb5 100644
--- a/src/deck.rs
+++ b/src/deck.rs
@@ -208,7 +208,7 @@ impl PieceTrait for Deck {
     let mut xupdates = vec![];
 
     if new_state == old_state {
-        throw!(OE::PieceHeld);
+      throw!(Ia::BadUiOperation);
     }      
 
     if old_state != Disabled {
diff --git a/src/hand.rs b/src/hand.rs
index dd675fef..693482e0 100644
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -313,7 +313,7 @@ impl PieceTrait for Hand {
       }
       ("claim", true) |
       ("deactivate", false) => {
-        throw!(OE::PieceHeld);
+        throw!(Ia::BadUiOperation);
       }
       _ => {
         throw!(Ia::BadUiOperation);