From 8dffb66d4aaddbf769f0fc3c40393f07ca10d0fb Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Tue, 8 Sep 2015 19:25:17 -0400
Subject: Init'd SDL_image

---
 src/main.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 27cc080..71b6595 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,11 +11,13 @@ Window win;
 
 int main(int argc,char **argv){
     //runs start-up procedures
-    if(SDL_Init(SDL_INIT_VIDEO) < 0){
-		std::cout << "SDL was not able to initialize! Error: " << SDL_GetError() << std::endl;
-		return -1;
-	}else{
-		atexit(SDL_Quit);
+    if(!SDL_Init(SDL_INIT_VIDEO)){
+    	atexit(SDL_Quit);
+    	if(!(IMG_Init(IMG_INIT_PNG)&IMG_INIT_PNG)){
+			std::cout<<"Could not init image libraries!\n"<<std::endl;
+			return -1;
+		}
+		atexit(IMG_Quit);
 		//Turn on double Buffering
         SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
         //create the window
@@ -24,17 +26,20 @@ int main(int argc,char **argv){
                                   | SDL_WINDOW_FULLSCREEN
                                   #endif // FULLSCREEN
                                   );
-        if(window == NULL){
-        	std::cout << "The window failed to generate! Error: " << SDL_GetError() << std::endl;
-        	return -1;
-        }else{
-            //set OpenGL context
+        if(window){
+        	//set OpenGL context
             mainGLContext = SDL_GL_CreateContext(window);
             if(mainGLContext == NULL){
             	std::cout << "The OpenGL context failed to initialize! Error: " << SDL_GetError() << std::endl;
             }
-		}
-    }
+		}else{
+			std::cout << "The window failed to generate! Error: " << SDL_GetError() << std::endl;
+        	return -1;
+        }
+    }else{
+		std::cout << "SDL was not able to initialize! Error: " << SDL_GetError() << std::endl;
+		return -1;
+	}
 	
 	
 	/**************************
-- 
cgit v1.2.3