From: Mischa POSLAWSKY <netris@shiar.org>
Date: Sat, 3 Mar 2007 20:53:42 +0000 (+0100)
Subject: code cosmetics: fix indentation
X-Git-Url: http://git.shiar.nl/netris.git/commitdiff_plain/b9be7d416f4550cd6c6d98228d8a61e4c61e2901

code cosmetics: fix indentation
---

diff --git a/server.c b/server.c
index c33a541..39a28a0 100644
--- a/server.c
+++ b/server.c
@@ -183,20 +183,20 @@ static MyEventType ConnGenFunc(EventGenRec *gen, MyEvent *event)
 		sizeof(val2));
 	AddEventGen(&netGen[new]);
 	netGen[new].player = event->u.net.uid = new;
-			{ //new connection; netGen already initialized in GenFunc
-				struct hostent *host;
-
-				sprintf(Players[new].host, "%s", inet_ntoa(addr.sin_addr));
-				if (addr.sin_family == AF_INET) {
-					host = gethostbyaddr((void *)&addr.sin_addr,
-					                     sizeof(struct in_addr), AF_INET);
-					if (host) {
-						strncpy(Players[new].host, host->h_name,
-							sizeof(Players[new].host) - 1);
-						Players[new].host[sizeof(Players[new].host) - 1] = 0;
-					} //set player's hostname
-				}
-			} //E_connect
+	{ //new connection; netGen already initialized in GenFunc
+		struct hostent *host;
+
+		sprintf(Players[new].host, "%s", inet_ntoa(addr.sin_addr));
+		if (addr.sin_family == AF_INET) {
+			host = gethostbyaddr((void *)&addr.sin_addr,
+								 sizeof(struct in_addr), AF_INET);
+			if (host) {
+				strncpy(Players[new].host, host->h_name,
+					sizeof(Players[new].host) - 1);
+				Players[new].host[sizeof(Players[new].host) - 1] = 0;
+			} //set player's hostname
+		}
+	} //E_connect
 	return E_connect;
 }
 
@@ -241,143 +241,143 @@ int StartServer(void)
 				if (verbose) fprintf(stderr, ": %d sent %d\n",
 					netGen[event.u.net.sender].fd, event.u.net.type);
 				switch(event.u.net.type) {
-					case NP_hello:
-//						if (event.u.net.type != NP_hello) ByeClient(new);
-					{
-						netint4 versiondata[2];
-						char data[255];
-						int major;
-						int protocolVersion;
-
-						memcpy(versiondata, event.u.net.data,
-							sizeof(versiondata));
-						major = ntoh4(versiondata[0]);
-						protocolVersion = ntoh4(versiondata[1]);
-						if (major != MAJOR_VERSION
-						 || protocolVersion != PROTOCOL_VERSION) {
-							snprintf(data, sizeof(data),
-								"Version mismatch: received %d.%d",
-								major, protocolVersion);
-							fprintf(stderr, "= Wrong version player #%d (%s)\n",
-								event.u.net.sender, data);
-							SendPacketTo(event.u.net.sender, 0, NP_error,
-								strlen(data)+1, data);
-							SCloseNet(event.u.net.sender);
-						} //version mismatch
-						fprintf(stderr, "* Accepted player #%d\n",
-							event.u.net.sender);
+				case NP_hello:
+//					if (event.u.net.type != NP_hello) ByeClient(new);
+				{
+					netint4 versiondata[2];
+					char data[255];
+					int major;
+					int protocolVersion;
+
+					memcpy(versiondata, event.u.net.data,
+						sizeof(versiondata));
+					major = ntoh4(versiondata[0]);
+					protocolVersion = ntoh4(versiondata[1]);
+					if (major != MAJOR_VERSION
+					 || protocolVersion != PROTOCOL_VERSION) {
+						snprintf(data, sizeof(data),
+							"Version mismatch: received %d.%d",
+							major, protocolVersion);
+						fprintf(stderr, "= Wrong version player #%d (%s)\n",
+							event.u.net.sender, data);
+						SendPacketTo(event.u.net.sender, 0, NP_error,
+							strlen(data)+1, data);
+						SCloseNet(event.u.net.sender);
+					} //version mismatch
+					fprintf(stderr, "* Accepted player #%d\n",
+						event.u.net.sender);
+					break;
+				} //NP_hello
+				case NP_newPlayer:
+				//receive player details and return other players
+					memcpy(&Players[event.u.net.sender],
+						event.u.net.data, event.u.net.size);
+					if (Players[event.u.net.sender].team < 1
+					|| Players[event.u.net.sender].team > 7) {
+						int team;
+
+						for (team = 1; team < 7; team++) {
+							for (i = 1; i < MAX_SCREENS; i++)
+								if ((Players[i].alive > 0) && (Players[i].team == team))
+									break; //team in use
+							if (i==MAX_SCREENS) break;
+						} //find unused team
+						Players[event.u.net.sender].team = team;
+						SendPacketTo(event.u.net.sender, event.u.net.sender, NP_team,
+							sizeof(Players[event.u.net.sender].team),
+							&Players[event.u.net.sender].team);
+					} //invalid team
+					if (Game.started < 2)
+						Players[event.u.net.sender].flags |= SCF_paused;
+					if (!Game.continuous && Game.started >= 2) {
+						char data[40];
+						strcpy(data, "Can't join: Game has already started");
+						fprintf(stderr, "- Can't join player #%d in "
+							"non-continuous game\n", event.u.net.sender);
+						SendPacketTo(event.u.net.sender, 0, NP_error,
+							strlen(data)+1, data);
+//						SCloseNet(event.u.net.sender, 0);
 						break;
-					} //NP_hello
-					case NP_newPlayer:
-					//receive player details and return other players
-						memcpy(&Players[event.u.net.sender],
-							event.u.net.data, event.u.net.size);
-						if (Players[event.u.net.sender].team < 1
-						|| Players[event.u.net.sender].team > 7) {
-							int team;
-
-							for (team = 1; team < 7; team++) {
-								for (i = 1; i < MAX_SCREENS; i++)
-									if ((Players[i].alive > 0) && (Players[i].team == team))
-										break; //team in use
-								if (i==MAX_SCREENS) break;
-							} //find unused team
-							Players[event.u.net.sender].team = team;
-							SendPacketTo(event.u.net.sender, event.u.net.sender, NP_team,
-								sizeof(Players[event.u.net.sender].team),
-								&Players[event.u.net.sender].team);
-						} //invalid team
-						if (Game.started < 2)
-							Players[event.u.net.sender].flags |= SCF_paused;
-						if (!Game.continuous && Game.started >= 2) {
-							char data[40];
-							strcpy(data, "Can't join: Game has already started");
-							fprintf(stderr, "- Can't join player #%d in "
-								"non-continuous game\n", event.u.net.sender);
-							SendPacketTo(event.u.net.sender, 0, NP_error,
-								strlen(data)+1, data);
-//							SCloseNet(event.u.net.sender, 0);
-							break;
-						} //can't join started game
-						{
-							static struct {
-								int playerflags;
-								int gravity;	//1
-								int started;	//2
-								int continuous;	//3
-								long seed;		//4
-								int initspeed;	//5
-							} data;
-
-							memcpy(&data, &Players[event.u.net.sender].flags,
-								sizeof(data.playerflags));
-							memcpy(&data.gravity, &Game,
-								sizeof(data) - sizeof(data.playerflags));
-							SendPacketTo(event.u.net.sender, 0, NP_gamedata,
-								sizeof(data), &data);
-						} //send game options
-						for (i = 1; i < MAX_SCREENS; i++)
-							if (netGen[i].fd >= 0 && i != event.u.net.sender) {
-								SendPacketTo(event.u.net.sender, i,
-									NP_newPlayer, sizeof(_Player), &Players[i]);
-								SendPacketTo(event.u.net.sender, i, NP_newPiece,
-									sizeof(Players[i].curShape), &Players[i].curShape);
-								SendPacketTo(i, event.u.net.sender, NP_newPlayer,
-									sizeof(_Player), &Players[event.u.net.sender]);
-							} //send (to) players
-						fprintf(stderr, "> Joined player #%d: %s <%s> (%s)\n",
-							event.u.net.sender,
-							Players[event.u.net.sender].name,
-							Players[event.u.net.sender].host,
-							teams[Players[event.u.net.sender].team]);
-						if (++playersReady >= minplayers) {
-							if (Game.started > 1)
-								SendPacketTo(event.u.net.sender, 0,
-									NP_start, 0, NULL);
-/*							else {
-								fprintf(stderr, "* Starting game (%010d)\n",
-									Game.seed);
-								for (i = 1; i < MAX_SCREENS; i++)
-									SendPacketTo(i, 0, NP_start, 0, NULL);
-								Game.started++;
-							} //first goahead (to all)*/
-						} //give go ahead
-						break; //NP_playerdata
-					case NP_newPiece:
-						memcpy(&Players[event.u.net.sender].curShape,
-							event.u.net.data, sizeof(Players[0].curShape));
-						goto sendtoall;
-					case NP_argghhh:
-						Players[event.u.net.sender].alive = 0;
-						fprintf(stderr, "< Player #%d died\n",
-							event.u.net.sender);
-						//check for unpaused game
-					case NP_pause:
+					} //can't join started game
 					{
-						Players[event.u.net.sender].flags ^= SCF_paused;
-						paused = Game.started < 1;
-						for (i = 1; i < MAX_SCREENS; i++)
-							if (Players[i].alive > 0)
-								paused |= Players[i].flags & SCF_paused;
-						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
-					sendtoall:
-//						if (event.u.net.type >= NP_pause)
-						if (event.u.net.type >= NP_rotright
-						 && Game.started < 2)
-							break;
-						for (i = 1; i < MAX_SCREENS; i++)
-							if (i != event.u.net.sender)
-							if (event.u.net.type != NP_giveJunk ||
-							Players[i].team != Players[event.u.net.sender].team)
-								SendPacketTo(i, event.u.net.sender,
-									event.u.net.type, event.u.net.size,
-									event.u.net.data);
-						break; //>=NP_paused
+						static struct {
+							int playerflags;
+							int gravity;	//1
+							int started;	//2
+							int continuous;	//3
+							long seed;		//4
+							int initspeed;	//5
+						} data;
+
+						memcpy(&data, &Players[event.u.net.sender].flags,
+							sizeof(data.playerflags));
+						memcpy(&data.gravity, &Game,
+							sizeof(data) - sizeof(data.playerflags));
+						SendPacketTo(event.u.net.sender, 0, NP_gamedata,
+							sizeof(data), &data);
+					} //send game options
+					for (i = 1; i < MAX_SCREENS; i++)
+						if (netGen[i].fd >= 0 && i != event.u.net.sender) {
+							SendPacketTo(event.u.net.sender, i,
+								NP_newPlayer, sizeof(_Player), &Players[i]);
+							SendPacketTo(event.u.net.sender, i, NP_newPiece,
+								sizeof(Players[i].curShape), &Players[i].curShape);
+							SendPacketTo(i, event.u.net.sender, NP_newPlayer,
+								sizeof(_Player), &Players[event.u.net.sender]);
+						} //send (to) players
+					fprintf(stderr, "> Joined player #%d: %s <%s> (%s)\n",
+						event.u.net.sender,
+						Players[event.u.net.sender].name,
+						Players[event.u.net.sender].host,
+						teams[Players[event.u.net.sender].team]);
+					if (++playersReady >= minplayers) {
+						if (Game.started > 1)
+							SendPacketTo(event.u.net.sender, 0,
+								NP_start, 0, NULL);
+/*						else {
+							fprintf(stderr, "* Starting game (%010d)\n",
+								Game.seed);
+							for (i = 1; i < MAX_SCREENS; i++)
+								SendPacketTo(i, 0, NP_start, 0, NULL);
+							Game.started++;
+						} //first goahead (to all)*/
+					} //give go ahead
+					break; //NP_playerdata
+				case NP_newPiece:
+					memcpy(&Players[event.u.net.sender].curShape,
+						event.u.net.data, sizeof(Players[0].curShape));
+					goto sendtoall;
+				case NP_argghhh:
+					Players[event.u.net.sender].alive = 0;
+					fprintf(stderr, "< Player #%d died\n",
+						event.u.net.sender);
+					//check for unpaused game
+				case NP_pause:
+				{
+					Players[event.u.net.sender].flags ^= SCF_paused;
+					paused = Game.started < 1;
+					for (i = 1; i < MAX_SCREENS; i++)
+						if (Players[i].alive > 0)
+							paused |= Players[i].flags & SCF_paused;
+					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
+				sendtoall:
+//					if (event.u.net.type >= NP_pause)
+					if (event.u.net.type >= NP_rotright
+					 && Game.started < 2)
+						break;
+					for (i = 1; i < MAX_SCREENS; i++)
+						if (i != event.u.net.sender)
+						if (event.u.net.type != NP_giveJunk ||
+						Players[i].team != Players[event.u.net.sender].team)
+							SendPacketTo(i, event.u.net.sender,
+								event.u.net.type, event.u.net.size,
+								event.u.net.data);
+					break; //>=NP_paused
 				}
 				break; //E_net
 			case E_connect:
@@ -469,39 +469,39 @@ void WriteConf(void)
 void HandleOption(char tag, char *value)
 {
 	switch (tag) {
-		case 'v':  //verbose
-			verbose = 1;
-			break;
-		case 'p':  //port
-			port = atoi(value);
-			break;
-		case 'c':  //min-players
-			Game.continuous = atoi(value);
-			break;
-		case 'm':  //min-players
-			minplayers = atoi(value);
-			break;
-		case 'x':  //max-players
-			maxplayers = atoi(value);
-			if (maxplayers >= MAX_SCREENS)
-				maxplayers = MAX_SCREENS;
-			break;
-		case 'q':  //quadra-style gravity
-			Game.gravity ^= 1;
-			break;
-		case 'i':  //speed (of level 1)
-			Game.initspeed = atof(value) * 1e6;
-			break;
-		case 's':  //seed
-			Game.seed = atoi(value);
-			break;
-		case 'H':  //info
-			SHeader();
-			DistInfo(); exit(0);
-		case 'h':  //help
-			SUsage(); exit(0);
-		default:
-			break;
+	case 'v':  //verbose
+		verbose = 1;
+		break;
+	case 'p':  //port
+		port = atoi(value);
+		break;
+	case 'c':  //min-players
+		Game.continuous = atoi(value);
+		break;
+	case 'm':  //min-players
+		minplayers = atoi(value);
+		break;
+	case 'x':  //max-players
+		maxplayers = atoi(value);
+		if (maxplayers >= MAX_SCREENS)
+			maxplayers = MAX_SCREENS;
+		break;
+	case 'q':  //quadra-style gravity
+		Game.gravity ^= 1;
+		break;
+	case 'i':  //speed (of level 1)
+		Game.initspeed = atof(value) * 1e6;
+		break;
+	case 's':  //seed
+		Game.seed = atoi(value);
+		break;
+	case 'H':  //info
+		SHeader();
+		DistInfo(); exit(0);
+	case 'h':  //help
+		SUsage(); exit(0);
+	default:
+		break;
 	}
 }