Fuel and radiation meter functionality

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

1 files changed, 11 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index 43b7333..30f315e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,8 @@ typedef enum {
 	RES_640,
 	RES_800,
 	RES_1280,
+	RES_1330W,
+	RES_1440W,
 	RES_1600W
 } ScreenResolution;
 
@@ -58,6 +60,8 @@ int main(int argc, char *argv[]) {
 				if ( strcasecmp(optarg,   "640") == 0 ) res = RES_640;
 				if ( strcasecmp(optarg,   "800") == 0 ) res = RES_800;
 				if ( strcasecmp(optarg,  "1280") == 0 ) res = RES_1280;
+				if ( strcasecmp(optarg, "1330W") == 0 ) res = RES_1330W;
+				if ( strcasecmp(optarg, "1440W") == 0 ) res = RES_1440W;
 				if ( strcasecmp(optarg, "1600W") == 0 ) res = RES_1600W;
 				break;
 			}
@@ -77,6 +81,8 @@ int main(int argc, char *argv[]) {
 				printf("  640  -   640 x  480\n");
 				printf("  800  -   800 x  600\n");
 				printf(" 1280  -  1280 x 1024\n");
+				printf("1330W  -  1330 x  900 (widescreen)\n");
+				printf("1440W  -  1440 x  900 (widescreen)\n");
 				printf("1600W  -  1600 x 1050 (widescreen)\n");
 				return 0;
 			}
@@ -101,6 +107,8 @@ int main(int argc, char *argv[]) {
 		case RES_640   : { width =  640;  height =  480;  break; }
 		case RES_800   : { width =  800;  height =  600;  break; }
 		case RES_1280  : { width = 1280;  height = 1024;  break; }
+		case RES_1330W : { width = 1330;  height =  900;  break; }
+		case RES_1440W : { width = 1440;  height =  900;  break; }
 		case RES_1600W : { width = 1680;  height = 1050;  break; }
 		default : { assert(this_point_not_reached); break; }
 	}
@@ -124,8 +132,9 @@ int main(int argc, char *argv[]) {
 	while ( !finished ) {
 	
 		/* Timer advances only when game is not paused */
-		if ( !game->paused ) {
-			t = SDL_GetTicks();
+		t = SDL_GetTicks();
+		if ( game->paused ) {
+			game->tlast = t;
 		}
 		
 		SDL_PollEvent(&event);