X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/5902d7f327fcf57d2b1a47f1b4a3aa98f4ab08a8..8e07b715e7538693509e8bd06247dd84ea75b7da:/server.c

diff --git a/server.c b/server.c
index 11c42e3..c33a541 100644
--- a/server.c
+++ b/server.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: game.c,v 1.39 1999/05/16 06:56:27 mhw Exp $
  */
 
 #define NOEXT
@@ -61,15 +59,18 @@ struct sockaddr_in addr;
 
 MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event);
 static EventGenRec netGen[MAX_SCREENS] = {
-	{ NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE } };
+	{ NULL, 0, FT_read, -1, NetGenFunc, EM_net, 0, "\0", 0, HEADER_SIZE }
+};
 
 static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event);
-static EventGenRec alarmGen =
-	{ &alarmGen, 0, FT_read, -1, AlarmGenFunc, EM_alarm };
+static EventGenRec alarmGen = {
+	&alarmGen, 0, FT_read, -1, AlarmGenFunc, EM_alarm
+};
 
 static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event);
-static EventGenRec connGen =
-	{ NULL, 0, FT_read, -1, ConnGenFunc, EM_connect };
+static EventGenRec connGen = {
+	NULL, 0, FT_read, -1, ConnGenFunc, EM_connect
+};
 
 static EventGenRec *nextGen = &alarmGen;
 
@@ -91,12 +92,12 @@ void SendPacketTo(short playa, short uid, NetPacketType type, int size, void *da
 		if (size > 0 && data && MyWrite(netGen[playa].fd, data, size) != size)
 			die("write");
 	}
-} //SendPacketTo
+}
 
 static MyEventType AlarmGenFunc(EventGenRec *gen, MyEvent *event)
 {
 	return E_alarm;
-} //AlarmGenFunc
+}
 
 void SCloseNet(short playa)
 { //kick some connection's ass!
@@ -112,7 +113,7 @@ void SCloseNet(short playa)
 	}
 	if (netGen[playa].next)
 		RemoveEventGen(&netGen[playa]);
-} //SCloseNet
+}
 
 void CloseNets(void)
 { //nou oogjes dicht en snaveltjes toe
@@ -122,7 +123,7 @@ void CloseNets(void)
 	for (i = 1; i < MAX_SCREENS; i++)
 		SCloseNet(i); //bye everybuddy
 	fprintf(stderr, "* All Done\n\n");
-} //CloseNets
+}
 
 MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
 { //receive
@@ -158,7 +159,7 @@ MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
 		return E_lostConn;
 	} //client sent quit signal
 	return E_net;
-} //NetGenFunc
+}
 
 
 static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
@@ -197,7 +198,7 @@ static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
 				}
 			} //E_connect
 	return E_connect;
-} //ConnGenFunc
+}
 
 void CountPlayers(void)
 { //count number of players/teams
@@ -211,7 +212,7 @@ void CountPlayers(void)
 			} //player of same team counted before
 		playercount++;
 	} //player alive
-} //CountPlayers
+}
 
 int StartServer(void)
 {
@@ -220,8 +221,10 @@ int StartServer(void)
 	int playersReady = 0;
 	int paused = 1;
 	int i;
-	char teams[10][7] = { "", "Green", "Cyan", "Blue", "Purple",
-	                      "Red", "Grey", "White", "*Orange" };
+	char teams[10][7] = {
+		"", "Green", "Cyan", "Blue", "Purple",
+		"Red", "Grey", "White", "*Orange"
+	};
 
 	do {
 		switch (WaitMyEvent(&event, EM_any)) {
@@ -418,7 +421,7 @@ int StartServer(void)
 		} //game (ready to) start(ed)
 	} while (1);
 	fprintf(stderr, "* Exiting server\n");
-} //StartServer
+}
 
 
 void SHeader(void)
@@ -461,7 +464,7 @@ void WriteConf(void)
 
 	fclose(file_out);
 	fprintf(stderr, "Wrote new game configuration to %s\n", CONFIG_FILE);
-} //WriteConf
+}
 
 void HandleOption(char tag, char *value)
 {
@@ -500,7 +503,7 @@ void HandleOption(char tag, char *value)
 		default:
 			break;
 	}
-} //HandleParam
+}
 
 void ReadConf(char *filename)
 {
@@ -535,7 +538,7 @@ void ReadConf(char *filename)
 		fprintf(stderr, "Unable to open config file %s.\n", filename);
 	} //defaults
 
-} //ReadConf
+}
 
 void CatchInt(int sig)
 {
@@ -610,7 +613,3 @@ int main(int argc, char **argv)
 	return 0;
 }
 
-/*
- * vi: ts=4 ai
- * vim: noai si
- */