shape frequency in global game data

[netris.git] / client.c

diff --git a/client.c b/client.c
index 1555e64e235c9399ff7eefa18c21cc5f98c8a176..43c741d6f159b4090eda450e56a84cb09f405ea0 100644 (file)
--- a/client.c
+++ b/client.c
@@ -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));