Use try as main body to keep same identation as upstream

While here, report error via cout, also as in upstream

Author: AMDmi3

Lesson0/src/main.cpp

@@ -5,14 +5,11 @@
 /*
  * Lesson 0: Test to make sure SDL is setup properly
  */
-int main(int, char**){
-	try {
-		SDL2pp::SDL(SDL_INIT_VIDEO);
-	} catch (SDL2pp::Exception& e) {
-		std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
-		return 1;
-	}
-
+int main(int, char**) try {
+	SDL2pp::SDL(SDL_INIT_VIDEO);
 	return 0;
+} catch (SDL2pp::Exception& e) {
+	std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+	return 1;
 }
 

Lesson1/src/main.cpp

@@ -6,45 +6,42 @@
 /*
  * Lesson 1: Hello World!
  */
-int main(int, char**){
-	try {
-		//First we need to start up SDL, and make sure it went ok
-		SDL2pp::SDL(SDL_INIT_VIDEO);
-
-		//Now create a window with title "Hello World" at 100, 100 on the screen with w:640 h:480 and show it
-		SDL2pp::Window win("Hello World!", 100, 100, 640, 480, SDL_WINDOW_SHOWN);
-
-		//Create a renderer that will draw to the window, -1 specifies that we want to load whichever
-		//video driver supports the flags we're passing
-		//Flags: SDL_RENDERER_ACCELERATED: We want to use hardware accelerated rendering
-		//SDL_RENDERER_PRESENTVSYNC: We want the renderer's present function (update screen) to be
-		//synchornized with the monitor's refresh rate
-		SDL2pp::Renderer ren(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-
-		//SDL 2.0 now uses textures to draw things but SDL_LoadBMP returns a surface
-		//this lets us choose when to upload or remove textures from the GPU
-		std::string imagePath = getResourcePath("Lesson1") + "hello.bmp";
-		SDL2pp::Surface bmp(imagePath);
-
-		//To use a hardware accelerated texture for rendering we can create one from
-		//the surface we loaded
-		SDL2pp::Texture tex(ren, bmp);
-
-		//Now lets draw our image
-		//First clear the renderer
-		ren.Clear();
-		//Draw the texture
-		ren.Copy(tex, SDL2pp::NullOpt, SDL2pp::NullOpt);
-		//Update the screen
-		ren.Present();
-
-		//Have the program wait for 2000ms so we get a chance to see the screen
-		SDL_Delay(2000);
-
-	} catch (SDL2pp::Exception& e) {
-		std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
-	}
+int main(int, char**) try {
+	//First we need to start up SDL, and make sure it went ok
+	SDL2pp::SDL(SDL_INIT_VIDEO);
+
+	//Now create a window with title "Hello World" at 100, 100 on the screen with w:640 h:480 and show it
+	SDL2pp::Window win("Hello World!", 100, 100, 640, 480, SDL_WINDOW_SHOWN);
+
+	//Create a renderer that will draw to the window, -1 specifies that we want to load whichever
+	//video driver supports the flags we're passing
+	//Flags: SDL_RENDERER_ACCELERATED: We want to use hardware accelerated rendering
+	//SDL_RENDERER_PRESENTVSYNC: We want the renderer's present function (update screen) to be
+	//synchornized with the monitor's refresh rate
+	SDL2pp::Renderer ren(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+
+	//SDL 2.0 now uses textures to draw things but SDL_LoadBMP returns a surface
+	//this lets us choose when to upload or remove textures from the GPU
+	std::string imagePath = getResourcePath("Lesson1") + "hello.bmp";
+	SDL2pp::Surface bmp(imagePath);
+
+	//To use a hardware accelerated texture for rendering we can create one from
+	//the surface we loaded
+	SDL2pp::Texture tex(ren, bmp);
+
+	//Now lets draw our image
+	//First clear the renderer
+	ren.Clear();
+	//Draw the texture
+	ren.Copy(tex, SDL2pp::NullOpt, SDL2pp::NullOpt);
+	//Update the screen
+	ren.Present();
+
+	//Have the program wait for 2000ms so we get a chance to see the screen
+	SDL_Delay(2000);
 
 	return 0;
+} catch (SDL2pp::Exception& e) {
+	std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+	return 1;
 }
-

Lesson2/src/main.cpp

@@ -26,50 +26,47 @@ void renderTexture(SDL2pp::Texture &tex, SDL2pp::Renderer &ren, int x, int y){
 	ren.Copy(tex, SDL2pp::NullOpt, dst);
 }
 
-int main(int, char**){
-	try {
-		//Start up SDL and make sure it went ok
-		SDL2pp::SDL sdl(SDL_INIT_VIDEO);
+int main(int, char**) try {
+	//Start up SDL and make sure it went ok
+	SDL2pp::SDL sdl(SDL_INIT_VIDEO);
 
-		//Setup our window and renderer
-		SDL2pp::Window window("Lesson 2", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
-		SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+	//Setup our window and renderer
+	SDL2pp::Window window("Lesson 2", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+	SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 
-		//The textures we'll be using
-		const std::string resPath = getResourcePath("Lesson2");
-		SDL2pp::Texture background(renderer, resPath + "background.bmp");
-		SDL2pp::Texture image(renderer, resPath + "image.bmp");
+	//The textures we'll be using
+	const std::string resPath = getResourcePath("Lesson2");
+	SDL2pp::Texture background(renderer, resPath + "background.bmp");
+	SDL2pp::Texture image(renderer, resPath + "image.bmp");
 
-		//Clear the window
-		renderer.Clear();
+	//Clear the window
+	renderer.Clear();
 
-		//Get the width and height from the texture so we know how much to move x,y by
-		//to tile it correctly
-		int bW = background.GetWidth(), bH = background.GetHeight();
+	//Get the width and height from the texture so we know how much to move x,y by
+	//to tile it correctly
+	int bW = background.GetWidth(), bH = background.GetHeight();
 
-		//We want to tile our background so draw it 4 times
-		renderTexture(background, renderer, 0, 0);
-		renderTexture(background, renderer, bW, 0);
-		renderTexture(background, renderer, 0, bH);
-		renderTexture(background, renderer, bW, bH);
+	//We want to tile our background so draw it 4 times
+	renderTexture(background, renderer, 0, 0);
+	renderTexture(background, renderer, bW, 0);
+	renderTexture(background, renderer, 0, bH);
+	renderTexture(background, renderer, bW, bH);
 
-		//Draw our image in the center of the window
-		//We need the foreground image's width to properly compute the position
-		//of it's top left corner so that the image will be centered
-		int iW = image.GetWidth(), iH = image.GetHeight();
-		int x = SCREEN_WIDTH / 2 - iW / 2;
-		int y = SCREEN_HEIGHT / 2 - iH / 2;
-		renderTexture(image, renderer, x, y);
+	//Draw our image in the center of the window
+	//We need the foreground image's width to properly compute the position
+	//of it's top left corner so that the image will be centered
+	int iW = image.GetWidth(), iH = image.GetHeight();
+	int x = SCREEN_WIDTH / 2 - iW / 2;
+	int y = SCREEN_HEIGHT / 2 - iH / 2;
+	renderTexture(image, renderer, x, y);
 
-		//Update the screen
-		renderer.Present();
-		SDL_Delay(2000);
-
-	} catch (SDL2pp::Exception& e) {
-		std::cerr << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
-		return 1;
-	}
+	//Update the screen
+	renderer.Present();
+	SDL_Delay(2000);
 
 	return 0;
+} catch (SDL2pp::Exception& e) {
+	std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+	return 1;
 }
 

Lesson3/src/main.cpp

@@ -42,50 +42,48 @@ void renderTexture(SDL2pp::Texture &tex, SDL2pp::Renderer &ren, int x, int y){
 	renderTexture(tex, ren, x, y, w, h);
 }
 
-int main(int, char**){
-	try {
-		//Start up SDL and make sure it went ok
-		SDL2pp::SDL sdl(SDL_INIT_VIDEO);
-		SDL2pp::SDLImage sdlimage;
+int main(int, char**) try {
+	//Start up SDL and make sure it went ok
+	SDL2pp::SDL sdl(SDL_INIT_VIDEO);
+	SDL2pp::SDLImage sdlimage;
 
-		//Setup our window and renderer
-		SDL2pp::Window window("Lesson 3", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
-		SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+	//Setup our window and renderer
+	SDL2pp::Window window("Lesson 3", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+	SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 
-		//The textures we'll be using
-		const std::string resPath = getResourcePath("Lesson3");
-		SDL2pp::Texture background(renderer, resPath + "background.png");
-		SDL2pp::Texture image(renderer, resPath + "image.png");
+	//The textures we'll be using
+	const std::string resPath = getResourcePath("Lesson3");
+	SDL2pp::Texture background(renderer, resPath + "background.png");
+	SDL2pp::Texture image(renderer, resPath + "image.png");
 
-		//Clear the window
-		renderer.Clear();
+	//Clear the window
+	renderer.Clear();
 
-		//Determine how many tiles we'll need to fill the screen
-		int xTiles = SCREEN_WIDTH / TILE_SIZE;
-		int yTiles = SCREEN_HEIGHT / TILE_SIZE;
+	//Determine how many tiles we'll need to fill the screen
+	int xTiles = SCREEN_WIDTH / TILE_SIZE;
+	int yTiles = SCREEN_HEIGHT / TILE_SIZE;
 
-		//Draw the tiles by calculating their positions
-		for (int i = 0; i < xTiles * yTiles; ++i){
-			int x = i % xTiles;
-			int y = i / xTiles;
-			renderTexture(background, renderer, x * TILE_SIZE, y * TILE_SIZE, TILE_SIZE, TILE_SIZE);
-		}
+	//Draw the tiles by calculating their positions
+	for (int i = 0; i < xTiles * yTiles; ++i){
+		int x = i % xTiles;
+		int y = i / xTiles;
+		renderTexture(background, renderer, x * TILE_SIZE, y * TILE_SIZE, TILE_SIZE, TILE_SIZE);
+	}
 
-		//Draw our image in the center of the window
-		//We need the foreground image's width to properly compute the position
-		//of it's top left corner so that the image will be centered
-		int iW = image.GetWidth(), iH = image.GetHeight();
-		int x = SCREEN_WIDTH / 2 - iW / 2;
-		int y = SCREEN_HEIGHT / 2 - iH / 2;
-		renderTexture(image, renderer, x, y);
+	//Draw our image in the center of the window
+	//We need the foreground image's width to properly compute the position
+	//of it's top left corner so that the image will be centered
+	int iW = image.GetWidth(), iH = image.GetHeight();
+	int x = SCREEN_WIDTH / 2 - iW / 2;
+	int y = SCREEN_HEIGHT / 2 - iH / 2;
+	renderTexture(image, renderer, x, y);
 
-		//Update the screen
-		renderer.Present();
-		SDL_Delay(2000);
-	} catch (SDL2pp::Exception& e) {
-		std::cerr << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
-		return 1;
-	}
+	//Update the screen
+	renderer.Present();
+	SDL_Delay(2000);
 
 	return 0;
+} catch (SDL2pp::Exception& e) {
+	std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+	return 1;
 }

Lesson4/src/main.cpp

@@ -40,59 +40,57 @@ void renderTexture(SDL2pp::Texture &tex, SDL2pp::Renderer &ren, int x, int y){
 	renderTexture(tex, ren, x, y, w, h);
 }
 
-int main(int, char**){
-	try {
-		//Start up SDL and make sure it went ok
-		SDL2pp::SDL sdl(SDL_INIT_VIDEO);
-		SDL2pp::SDLImage sdlimage;
+int main(int, char**) try {
+	//Start up SDL and make sure it went ok
+	SDL2pp::SDL sdl(SDL_INIT_VIDEO);
+	SDL2pp::SDLImage sdlimage;
 
-		//Setup our window and renderer, this time let's put our window in the center
-		//of the screen
-		SDL2pp::Window window("Lesson 4", SDL_WINDOWPOS_CENTERED,
-				SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
-		SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+	//Setup our window and renderer, this time let's put our window in the center
+	//of the screen
+	SDL2pp::Window window("Lesson 4", SDL_WINDOWPOS_CENTERED,
+			SDL_WINDOWPOS_CENTERED, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+	SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 
-		//The texture we'll be using
-		const std::string resPath = getResourcePath("Lesson4");
-		SDL2pp::Texture image(renderer, resPath + "image.png");
+	//The texture we'll be using
+	const std::string resPath = getResourcePath("Lesson4");
+	SDL2pp::Texture image(renderer, resPath + "image.png");
 
-		//Our texture size won't change, so we can get it here
-		//instead of constantly allocating/deleting ints in the loop
-		int iW = image.GetWidth(), iH = image.GetHeight();
-		int x = SCREEN_WIDTH / 2 - iW / 2;
-		int y = SCREEN_HEIGHT / 2 - iH / 2;
+	//Our texture size won't change, so we can get it here
+	//instead of constantly allocating/deleting ints in the loop
+	int iW = image.GetWidth(), iH = image.GetHeight();
+	int x = SCREEN_WIDTH / 2 - iW / 2;
+	int y = SCREEN_HEIGHT / 2 - iH / 2;
 
-		//Our event structure
-		SDL_Event e;
-		//For tracking if we want to quit
-		bool quit = false;
-		while (!quit){
-			//Read any events that occured, for now we'll just quit if any event occurs
-			while (SDL_PollEvent(&e)){
-				//If user closes the window
-				if (e.type == SDL_QUIT){
-					quit = true;
-				}
-				//If user presses any key
-				if (e.type == SDL_KEYDOWN){
-					quit = true;
-				}
-				//If user clicks the mouse
-				if (e.type == SDL_MOUSEBUTTONDOWN){
-					quit = true;
-				}
+	//Our event structure
+	SDL_Event e;
+	//For tracking if we want to quit
+	bool quit = false;
+	while (!quit){
+		//Read any events that occured, for now we'll just quit if any event occurs
+		while (SDL_PollEvent(&e)){
+			//If user closes the window
+			if (e.type == SDL_QUIT){
+				quit = true;
+			}
+			//If user presses any key
+			if (e.type == SDL_KEYDOWN){
+				quit = true;
+			}
+			//If user clicks the mouse
+			if (e.type == SDL_MOUSEBUTTONDOWN){
+				quit = true;
 			}
-			//Rendering
-			renderer.Clear();
-			//Draw the image
-			renderTexture(image, renderer, x, y);
-			//Update the screen
-			renderer.Present();
 		}
-	} catch (SDL2pp::Exception& e) {
-		std::cerr << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
-		return 1;
+		//Rendering
+		renderer.Clear();
+		//Draw the image
+		renderTexture(image, renderer, x, y);
+		//Update the screen
+		renderer.Present();
 	}
 
 	return 0;
+} catch (SDL2pp::Exception& e) {
+	std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+	return 1;
 }