X-Git-Url: http://git.shiar.net/netris.git/blobdiff_plain/0e779d807aa1830dde2f4a75117fd16f5627dc76..647a237119ca10b9c3039c157594599e7ff50411:/game.c

diff --git a/game.c b/game.c
index 6ad7e8b..e0a8cda 100644
--- a/game.c
+++ b/game.c
@@ -96,13 +96,13 @@ void MapKeys(char *newKeys)
 				fprintf(stderr, "Duplicate key mappings:\n");
 			errs++;
 			fprintf(stderr, "  %s mapped to both %s and %s\n",
-					scratch, keyNames[used[ch]-1], keyNames[k]);
+				scratch, keyNames[used[ch]-1], keyNames[k]);
 		}
 		used[ch] = k + 1;
 	}
 	if (errs)
 		exit(1);
-} //MapKeys
+}
 
 void WriteConf(void)
 {
@@ -116,7 +116,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)
 {
@@ -161,6 +161,7 @@ void HandleOption(char tag, char *value)
 		case 'k':	//keys
 			MapKeys(value); break;
 		case 'H':	//info
+			Header();
 			DistInfo(); exit(0);
 		case 'R':	//rules
 			Rules(); exit(0);
@@ -169,7 +170,7 @@ void HandleOption(char tag, char *value)
 		default:
 			Usage(); exit(1);
 	}
-} //HandleParam
+}
 
 void ReadConf(char *filename)
 {
@@ -203,7 +204,7 @@ void ReadConf(char *filename)
 		fprintf(stderr, "Unable to open config file %s.\n", filename);
 	} //defaults
 
-} //ReadConf
+}
 
 int StartNewPiece(int scr, char shape)
 {
@@ -215,7 +216,7 @@ int StartNewPiece(int scr, char shape)
 	Players[scr].curY = Players[scr].boardVisible + 4;
 	Players[scr].curX = Players[scr].boardWidth / 2 - 2;
 	while (!ShapeVisible(Players[scr].curShape, scr,
-			Players[scr].curY, Players[scr].curX))
+	                     Players[scr].curY, Players[scr].curX))
 		Players[scr].curY--;
 	if (!ShapeFits(Players[scr].curShape, scr,
 			Players[scr].curY, Players[scr].curX))
@@ -233,7 +234,7 @@ void checkPaused(void)
 	for (i = 1; i < MAX_SCREENS; i++) if (Players[i].alive > 0)
 		paused |= Players[i].flags & SCF_paused;
 	if (paused) paused = 1;
-} //checkPaused
+}
 
 void StartGame(void)
 { //init new game
@@ -246,7 +247,7 @@ void StartGame(void)
 		Game.speed /= SPEEDINC;
 	if (Game.speed < SPEEDMINIMUM)
 		Game.speed = SPEEDMINIMUM;
-	ResetBaseTime();			//reset timer
+	ResetBaseTime();  //reset timer
 	SetITimer(Game.speed, Game.speed);
 	Players[me].nextShape = ChooseOption(stdOptions);
 	for (i = 1; i <= maxPlayer; i++) {
@@ -256,7 +257,7 @@ void StartGame(void)
 		ClearField(i);
 	} //reset all players
 	InitFields();
-} //StartGame
+}
 
 void CheckClears(int scr)
 { //check for full lines
@@ -265,7 +266,7 @@ void CheckClears(int scr)
 //	int linevaluesq[] = { 25, 50, 100, 200, 500, 720, 980, 1280, 1620, 2000,
 //	                      2420, 2880, 3380, 3920, 4500, 5120, 5780, 6480 };
 	int linevaluesq[] = { 20, 50, 100, 200, 500, 750, 1000, 1250, 1500, 2000,
-						2500, 3000, 3500, 4000, 4500, 5000, 6000, 7500 };
+	                      2500, 3000, 3500, 4000, 4500, 5000, 6000, 7500 };
 
 	if ((linesCleared = ClearFullLines(scr)) > 0) {
 		if (game == GT_onePlayer)
@@ -301,7 +302,7 @@ void CheckClears(int scr)
 			} //singleplayer
 		} //IT'S YOU
 	} //lines cleared
-} //CheckClears
+}
 
 void OneGame(void)
 {
@@ -727,8 +728,9 @@ int main(int argc, char **argv)
 //		ReadConf(optarg);
 //	else
 	ReadConf(CONFIG_FILE);
-	while ((ch = getopt_long(argc, argv,
-			"hHRk:c:n:odDSCap:i:l:t:", options, NULL)) != -1)
+	while ((ch = getopt_long(
+		argc, argv, "hHRk:c:n:odDSCap:i:l:t:", options, NULL
+	)) != -1)
 		HandleOption(ch, optarg);
 	if (optind < argc) {
 		Usage();
@@ -736,7 +738,7 @@ int main(int argc, char **argv)
 	}
 //	WriteConf();
 
-	InitScreens();				//setup screen
+	InitScreens();  //setup screen
 	if (game == GT_classicTwo) {
 		spied = 1;
 		InitiateConnection(hostStr, port);