1 files changed, 5 insertions, 12 deletions
diff --git a/main.cpp b/main.cpp
index c2b91fe..55db293 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,8 +9,6 @@ int main(int argc, char* args[]) {
 
     // Main SDL event structure
     SDL_Event event;
-    // Ggame window
-    SDL_Surface *screen;
     // Current level number
     int levelNo = 1;
     // Main loop continues while true
@@ -18,17 +16,13 @@ int main(int argc, char* args[]) {
     // Timer start
     Uint32 startTicks = 0;
 
+    // Game window
+    Screen screen;
+
     // Initialise SDL
     if (SDL_Init(SDL_INIT_EVERYTHING) == -1)
         return 1;
 
-    // Turn on the main screen
-    if (!(screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_BPP, SDL_SWSURFACE)))
-        return 1;
-
-    // Set window title
-    SDL_WM_SetCaption("Intense Marcus", NULL);
-
     Level level;
     level.changeLevel(levelNo);
 
@@ -50,11 +44,10 @@ int main(int argc, char* args[]) {
         level.move();
 
         // Draw level
-        level.draw(screen);
+        level.draw(&screen);
 
         // Update screen
-        if (SDL_Flip(screen) == -1)
-            return 1;
+        screen.flip();
 
         // Set FPS cap to 30
         if ((SDL_GetTicks() - startTicks) < 1000 / FPS)