Put timer stuff in status line

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

1 files changed, 6 insertions, 9 deletions

diff --git a/src/main.c b/src/main.c
index 86646dc..3c84104 100644
--- a/src/main.c
+++ b/src/main.c
@@ -277,10 +277,12 @@ int main(int argc, char *argv[]) {
 		if ( mouse_thrust ) game->thrusting = 0;
 		
 		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",
+			printf("%+7.4f %+7.4f %+7.4f    %+5.1f deg   %+7.5f %+7.5f %+7.5f     %2i %2i %2i   %3i fps "
+			       "(r:%6lli p:%6lli)  \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->cur_room_x, game->cur_room_y, game->cur_room_z, game->fps,
+				game->time_render, game->time_physics);
 			fflush(stdout);
 		}
 		
@@ -293,13 +295,8 @@ int main(int argc, char *argv[]) {
 		}
 		
 		/* Wait for how long it takes the graphics card to catch up, at the most recent measurement. */
-		if ( game->time_physics < game->time_render ) {
-			//printf("render: %lli us, physics: %lli us, sleeping for %lli us   \n",
-			//		game->time_render, game->time_physics, game->time_render - game->time_physics);
-			if ( !gameopts.no_framerate_limit ) usleep(game->time_render-game->time_physics);
-		} else {
-			//printf("render: %lli us, physics: %lli us, not sleeping   \n",
-			//		game->time_render, game->time_physics);
+		if ( !gameopts.no_framerate_limit && (game->time_physics < game->time_render) ) {
+			usleep(game->time_render-game->time_physics);
 		}
 		
 	}