X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=b8a2fcb2dc2e88c4b6e187a2ce264aff35c7e836;hp=a90d8b2dea1418bfdd3be82a2461a92a7b216dc0;hb=27e1cfa401e4223550f8a8cc434ae0f4605bf775;hpb=a40c1ed8a796ad846a254da83a83ae92c3184228

diff --git a/include/game.php b/include/game.php
index a90d8b2..b8a2fcb 100644
--- a/include/game.php
+++ b/include/game.php
@@ -98,7 +98,11 @@ if($ok)
 }
 /* end check for Schweinchen */
 
-set_gametype($gametype); /* this sets the $CARDS variable */
+/* set the $CARDS variable, needed for sorting the cards
+ * we set it to normal so that the pre-game phase is handled ok
+ * and later set it to the correct game type that is played
+ */
+set_gametype('normal');
 
 /* put everyting in a form */
 echo "<form action=\"index.php?action=game&me=$me\" method=\"post\">\n";
@@ -185,6 +189,7 @@ switch($mystatus)
 		    /* whos turn is it? */
 		    DB_set_player_by_gameid($gameid,$user);
 		    $ok = 0;
+		    break;
 		  }
 	      };
 	    if($ok)
@@ -376,6 +381,7 @@ switch($mystatus)
 	  {
 	    $ok = 0;
 	    DB_set_player_by_gameid($gameid,$user);
+	    break;
 	  }
       };
 
@@ -903,6 +909,7 @@ switch($mystatus)
 	      {
 		$ok = 0;
 		DB_set_player_by_gameid($gameid,$user);
+		break;
 	      }
 	  }
 	if($ok)