X-Git-Url: http://git.shiar.nl/netris.git/blobdiff_plain/68f83cbe5b56d04c74ad758cf5d73b2c11d2f775..111faa2a586338771d8193bcc9f4f109f9ba8adf:/client.c

diff --git a/client.c b/client.c
index 1555e64..d4ab95a 100644
--- a/client.c
+++ b/client.c
@@ -59,7 +59,7 @@ static char *keyNames[KT_numKeys+1] = {
 	"Faster", "Pause", "Redraw", "Say", "Quit", NULL
 };
 
-sets_t Sets = {7, 0, 1, 1, 1};
+sets_t Sets = {3, 0, 1, 1, 1};
 
 static char keyTable[KT_numKeys+1];
 
@@ -262,7 +262,7 @@ static void game_reset(void)
 
 	ResetBaseTime();  //reset timer
 	SetITimer(Game.speed, Game.speed);
-	Players[me].nextShape = ChooseOption(stdOptions);
+	Players[me].nextShape = ChooseOption(Game.shapes);
 	for (i = 1; i <= maxPlayer; i++) {
 		Players[i].score.score = Players[i].score.lines
 		= Players[i].score.adds = 0;
@@ -684,7 +684,7 @@ static void game_loop(void)
 	while (gameStatus) {
 		gameStatus = 2;
 		if (Players[me].alive > 0) {
-			if (!player_piece(me, ChooseOption(stdOptions))) {
+			if (!player_piece(me, ChooseOption(Game.shapes))) {
 				netint4 data[4];
 
 				Players[me].alive = 0;
@@ -812,7 +812,10 @@ int main(int argc, char **argv)
 		game_loop();
 	} //client
 	else {
+		int i;
 		Game.seed = time(0);
+		for (i = 0; i < sizeof(Game.shapes) / sizeof(Game.shapes[0]); i++)
+			Game.shapes[i] = 1;
 		Game.started = 2;
 		me = 1;
 		memcpy(&Players[me], &Players[0], sizeof(player_t));