Minor spades bug fixes

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index cccfc6aa20920b9f9b21ff065017d1e61e1d733a..e5516e0710079d6575d33603f95be6254fc557a6 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -43,7 +43,7 @@ function sp_reset(type)
        # Per game
        if (type >= 2) {
                sp_channel  = ""    #     channel to play in
-               sp_state    = "new" #     {new,join,bid,play}
+               sp_state    = "new" #     {new,join,bid,pass,play}
                sp_owner    = ""    #     Who started the game
                sp_playto   = 0     #     Score the game will go to
                sp_dealer   =-1     #     Who is dealing this round
@@ -451,7 +451,7 @@ sp_state == "play" &&
 }
 
 !sp_valid &&
-(sp_state "bid" || sp_state == "play") &&
+(sp_state == "bid" || sp_state == "play") &&
 /^\.(bid|play)\>/ {
        if (sp_from in sp_players)
                say(".slap " FROM ", it is not your turn.")
@@ -618,15 +618,17 @@ sp_state == "play" &&
        if (sp_state == "new") {
                say("There is no game in progress")
        }
+       if (sp_state ~ "join|bid|pass|play") {
+               say("Playing to: " \
+                   sp_playto " points, " \
+                   sp_limit  " bags")
+       }
        if (sp_state == "join") {
                say("Waiting for players: " \
                    sp_order[0] " " sp_order[1] " " \
                    sp_order[2] " " sp_order[3])
        }
        if (sp_state ~ "bid|pass|play") {
-               say("Playing to: " \
-                   sp_playto " points, " \
-                   sp_limit  " bags")
                say(sp_team(0) ": " \
                    int(sp_scores[0]) " points, " \
                    int(sp_bags(0))   " bags")