X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/314fb8c12b376d5e9bc62ec8b5db9458618a162b..a078512cb2e78dfb67a5e2564d9168fffe830c68:/server.c

diff --git a/server.c b/server.c
index 947c8e1..b30ba02 100644
--- a/server.c
+++ b/server.c
@@ -21,6 +21,7 @@
 #include "netris.h"
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
@@ -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