X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/a48189e5c6981f787eb634e94c940ca5b2e517e2..a078512cb2e78dfb67a5e2564d9168fffe830c68:/server.c diff --git a/server.c b/server.c index fe7eefc..b30ba02 100644 --- a/server.c +++ b/server.c @@ -21,6 +21,7 @@ #include "netris.h" #include +#include #include #include #include @@ -222,7 +223,7 @@ int StartServer(void) MyEvent event; netint2 currentpiece[MAX_SCREENS]; int playersReady = 0; - int paused = 1; + bool paused = 1; int i; char teams[10][7] = { "", "Green", "Cyan", "Blue", "Purple", @@ -313,7 +314,7 @@ int StartServer(void) memcpy(&data, &Players[event.u.net.sender].flags, sizeof(data.playerflags)); - memcpy(&data.gravity, &Game, + memcpy(&data.gravity, &Game.gravity, sizeof(data) - sizeof(data.playerflags)); SendPacketTo(event.u.net.sender, 0, NP_gamedata, sizeof(data), &data); @@ -360,10 +361,9 @@ int StartServer(void) paused = Game.started < 1; for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive > 0) - paused |= Players[i].flags & SCF_paused; + paused |= (Players[i].flags & SCF_paused) != 0; fprintf(stderr, "* Player #%d (un)paused (pause=%d)\n", event.u.net.sender, paused); - if (paused) paused = 1; goto sendtoall; } //NP_pause default: //relay data to all players @@ -455,22 +455,6 @@ void SUsage(void) ); } -void WriteConf(void) -{ - FILE *file_out; - - file_out = fopen(CONFIG_FILE, "w"); - if (file_out == NULL) { - perror("Error writing config file"); - exit(1); - } - - fprintf(file_out, "### NETRIS %s Config file ###\n\n", version_string); - - fclose(file_out); - fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE); -} - void HandleOption(char tag, char *value) { switch (tag) {