comments

1 files changed, 11 insertions, 11 deletions

diff --git a/balls.cpp b/balls.cpp
index 55dee50..6dbfcb5 100644
--- a/balls.cpp
+++ b/balls.cpp
@@ -45,15 +45,6 @@ int
 main(int argc, char *argv[]) {
 	int nballs;
 
-	glutInit(&argc, argv);
-	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
-	glutInitWindowSize(WIDTH, HEIGHT);
-	glutCreateWindow("Balls");
-
-	glutKeyboardFunc(keyboard);
-	glutDisplayFunc(display);
-	glutReshapeFunc(reshape);
-
 	nballs = NBALLS_DEFAULT;
 	if (argc > 1) {
 		if (sscanf(argv[1], "%d", &nballs) != 1 || nballs < 1) {
@@ -65,10 +56,19 @@ main(int argc, char *argv[]) {
 	balls = makeBalls(nballs);
 	collisionPartition = partitionCollisions(balls);
 
-	glutTimerFunc(FRAME_TIME_MS, animate, 0);
+	/* Initialize window. */
+	glutInit(&argc, argv);
+	glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
+	glutInitWindowSize(WIDTH, HEIGHT);
+	glutCreateWindow("Balls");
 
-	glutMainLoop();
+	/* Set callbacks. */
+	glutKeyboardFunc(keyboard);
+	glutDisplayFunc(display);
+	glutReshapeFunc(reshape);
+	glutTimerFunc(FRAME_TIME_MS, animate, 0);
 
+	glutMainLoop(); /* never returns */
 	return 1;
 }