Formatting

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@164 84d2e878-0bd5-11dd-ad15-13eda11d74c5

1 files changed, 34 insertions, 31 deletions

diff --git a/src/main.c b/src/main.c
index 2c1459e..b521db2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,6 +41,36 @@ static void main_version() {
 	printf("Thrust3D version "PACKAGE_VERSION", (c) 2008 Thomas White <taw27@srcf.ucam.org>\n");
 }
 
+static void main_help() {
+	printf("Syntax: %s [options]\n\n", argv[0]);
+	printf("Post-apocalyptic Jet Set Willy, set in a 3D nuclear power station.\n\n");
+	printf("  -h,  --help                Display this help message and exit.\n");
+	printf("  -v,  --version             Display version number and exit.\n");
+	printf("  -r,  --resolution <res>    Set display resolution. See below for possible values for <res>.\n");
+	printf("  -f,  --fullscreen          Use the full screen.\n");
+	printf("  -n,  --no-music            Don't play any background music.\n");
+	printf("\nAdvanced options:\n\n");
+	printf("       --disable-vbos        Disable the use of vertex buffer objects.\n");
+	printf("       --disable-fbos        Disable the use of framebuffer objects.\n");
+	printf("       --disable-shaders     Disable the use of shaders.\n");
+	printf("       --audio-debug         Print audio debugging messages to stdout.\n");
+	printf("       --game-debug          Print game control debugging messages to stdout.\n");
+	printf("       --no-framerate-limit  Do not wait between frames.\n");
+	printf("       --status-line         Show game status on the terminal.\n");
+	printf("\n");
+	printf("Allowable values for <res> are as follows:\n\n");
+	printf("<res>    Width   Height\n");
+	printf("  640  -   640 x  480\n");
+	printf("  800  -   800 x  600 (this is the default)\n");
+	printf(" 1024  -  1024 x  768\n");
+	printf(" 1280  -  1280 x 1024\n");
+	printf(" 1330  -  1330 x  900 (widescreen)\n");
+	printf(" 1440  -  1440 x  900 (widescreen)\n");
+	printf(" 1680  -  1680 x 1050 (widescreen)\n");
+	printf("\n");
+	main_version();
+}
+
 int main(int argc, char *argv[]) {
 
 	SDL_Event event;
@@ -116,34 +146,7 @@ int main(int argc, char *argv[]) {
 			}
 						
 			case 'h' : {
-				printf("Syntax: %s [options]\n\n", argv[0]);
-				printf("Post-apocalyptic Jet Set Willy, set in a 3D nuclear power station.\n\n");
-				printf("  -h,  --help                Display this help message and exit.\n");
-				printf("  -v,  --version             Display version number and exit.\n");
-				printf("  -r,  --resolution <res>    Set display resolution. "
-								    "See below for possible values for <res>.\n");
-				printf("  -f,  --fullscreen          Use the full screen.\n");
-				printf("  -n,  --no-music            Don't play any background music.\n");
-				printf("\nAdvanced options:\n\n");
-				printf("       --disable-vbos        Disable the use of vertex buffer objects.\n");
-				printf("       --disable-fbos        Disable the use of framebuffer objects.\n");
-				printf("       --disable-shaders     Disable the use of shaders.\n");
-				printf("       --audio-debug         Print audio debugging messages to stdout.\n");
-				printf("       --game-debug          Print game control debugging messages to stdout.\n");
-				printf("       --no-framerate-limit  Do not wait between frames.\n");
-				printf("       --status-line         Show game status on the terminal.\n");
-				printf("\n");
-				printf("Allowable values for <res> are as follows:\n\n");
-				printf("<res>    Width   Height\n");
-				printf("  640  -   640 x  480\n");
-				printf("  800  -   800 x  600 (this is the default)\n");
-				printf(" 1024  -  1024 x  768\n");
-				printf(" 1280  -  1280 x 1024\n");
-				printf(" 1330  -  1330 x  900 (widescreen)\n");
-				printf(" 1440  -  1440 x  900 (widescreen)\n");
-				printf(" 1680  -  1680 x 1050 (widescreen)\n");
-				printf("\n");
-				main_version();
+				main_help();
 				return 0;
 			}
 			
@@ -241,9 +244,9 @@ int main(int argc, char *argv[]) {
 		
 		if ( gameopts.status_line ) {
 			printf("%+7.4f %+7.4f %+7.4f    %+5.1f deg   %+7.5f %+7.5f %+7.5f     %2i %2i %2i   %3i fps\r",
-					game->lander->x, game->lander->y, game->lander->z,
-					rad2deg(game->lander->yaw), game->lander->vx, game->lander->vy, game->lander->vz,
-					game->cur_room_x, game->cur_room_y, game->cur_room_z, game->fps);
+				game->lander->x, game->lander->y, game->lander->z,
+				rad2deg(game->lander->yaw), game->lander->vx, game->lander->vy, game->lander->vz,
+				game->cur_room_x, game->cur_room_y, game->cur_room_z, game->fps);
 			fflush(stdout);
 		}