Remove from the TODO

For some reason they specify the minor version too, which is retarded.

CMakeLists.txt

@@ -34,7 +34,7 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3 -ffast-math")
 set(CMAKE_C_FLAGS_MINSIZEREL "-Os")
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(ALLEG5 REQUIRED allegro-5)
+pkg_check_modules(ALLEG5 REQUIRED allegro-5>=5.1.9)
 pkg_check_modules(ALLEG5-PRIM REQUIRED allegro_primitives-5)
 pkg_check_modules(ALLEG5-FONT REQUIRED allegro_font-5)
 

TODO

@@ -0,0 +1,3 @@
+TODO:
+ - Add a fullscreen mode.
+ - Add presets with stellar masses (for gravity simulation).

src/event_manager.c

@@ -101,6 +101,9 @@ void set_key(int keycode, int value) {
 		case ALLEGRO_KEY_F:
 			keys[KEY_FULLSCREEN] = value;
 			break;
+		case ALLEGRO_KEY_P:
+			keys[KEY_PAUSE] = value;
+			break;
 		default:
 			break;
 	}

src/event_manager.h

@@ -27,7 +27,8 @@ enum {
 	KEY_RIGHT       = 0x3,
 	KEY_RESET       = 0x4,
 	KEY_FULLSCREEN  = 0x5,
-	KEY_MAX         = 0x6
+	KEY_PAUSE       = 0x6,
+	KEY_MAX         = 0x7
 };
 
 /**

src/globals.h

@@ -26,7 +26,7 @@
 #	define FPS 60.0f
 #endif
 #ifndef ACCEL
-#	define ACCEL 0.5f
+#	define ACCEL 0.1f
 #endif
 #ifndef TURN_ACCEL
 #	define TURN_ACCEL (M_PI / FPS)  // turn at pi radians / sec

src/main.c

@@ -33,7 +33,7 @@ int show_info;
 const char *help =
 	"HELP:\n"
 	"LEFT/RIGHT - turn the ship\n"
-	"UP/DOWN - accelerate/decelerate\n"
+	"UP/DOWN - accelerate/reverse accelerate\n"
 	"R - reset the simulation\n"
 	"I - show/hide simulation information\n"
 	"H - show/hide this help information\n"
@@ -44,11 +44,13 @@ const char *info_format =
 	"x: %f\n"
 	"y: %f\n"
 	"angle: %f (%f degrees)\n"
-	"velX: %f\n"
+	"velX: %f px/sec\n"
-	"velY: %f";
+	"velY: %f px/sec";
 
 int main() {
-	printf("SpaceShipSim v%s\n", VERSION);
+	char title[32];
+	sprintf(title, "SpaceShipSim v%s", VERSION);
+	puts(title);
 
 	if(!al_init())
 	{
@@ -79,6 +81,7 @@ int main() {
 		fprintf(stderr, "alleg5: failed to initialize display.\n");
 		return 1;
 	}
+	al_set_window_title(display, title);
 #ifdef DEBUG
 	puts("Created display.");
 #endif
@@ -101,6 +104,8 @@ int main() {
 	redraw = 1;
 	show_help = 1;
 	show_info = 1;
+	int paused = 0;
+	int old_paused = 0;
 	while(run)
 	{
 		handle_event();
@@ -108,14 +113,19 @@ int main() {
 		// only redraw or run simulation if the timer event has occurred
 		if(redraw)
 		{
-			if(key_is_down(KEY_RESET))
+			if(paused == old_paused && key_is_down(KEY_PAUSE))
-				ship_init(&ship, WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2);
+				paused = !paused;
-			/*
+			else if(paused != old_paused && !key_is_down(KEY_PAUSE))
-			 * We only run the simulation when the timer goes off so it's
+				old_paused = paused;
-			 * running at a consistent rate, rather than dependent on random
+
-			 * events.
+			if(!paused)
-			 */
+			{
-			ship_update(&ship);
+				if(key_is_down(KEY_RESET))
+					ship_init(&ship, WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2);
+				else
+					ship_update(&ship);
+			}
+
 			al_clear_to_color(al_map_rgb(0, 0, 0));
 			ship_draw(&ship);
 			if(show_info)
@@ -125,7 +135,7 @@ int main() {
 						ship.x, ship.y,
 						ship.direction,
 						RAD_TO_DEG(ship.direction),
-						ship.velX, ship.velY);
+						ship.velX * FPS, ship.velY * FPS);
 				al_draw_multiline_text(font,
 						al_map_rgb(0xFF, 0xFF, 0xFF),
 						5, 5, WINDOW_WIDTH, 10.0f,
@@ -137,7 +147,7 @@ int main() {
 			{
 				al_draw_multiline_text(font,
 						al_map_rgb(0xFF, 0xFF, 0xFF),
-						WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2,
+						WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2 - 50,
 						WINDOW_WIDTH, 10.0f,
 						ALLEGRO_ALIGN_CENTRE,
 						help);