8 files changed, 32 insertions, 26 deletions
diff --git a/gamestate.cpp b/gamestate.cpp
index 812f26c..f0de67a 100644
--- a/gamestate.cpp
+++ b/gamestate.cpp

@@ -22,7 +22,7 @@ class GameBoard {
 class LoadGameState : public State {
        public:
                LoadGameState(int level);
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
                
        private:
                int level;
@@ -31,7 +31,7 @@ class LoadGameState : public State {
 class PlayGameState : public State {
        public:
                PlayGameState(int level, GameBoard* board, int playerx, int playery);
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
        
        private:
                bool move(int x, int y);
@@ -81,7 +81,7 @@ void incrementIfNeighbor(int x, int y, bool temp[WIDTH][HEIGHT], int* tick, int
        }
 }
-State* GameState::operator() (SDL_Renderer* renderer)
+State* GameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        return new LoadGameState(0);
 }
@@ -91,8 +91,12 @@ LoadGameState::LoadGameState(int m_level)
        level = m_level;
 }
-State* LoadGameState::operator() (SDL_Renderer* renderer)
+State* LoadGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
+        char* wintitle = new char[50];
+        sprintf(wintitle, "Maze Of Life - Level %d", level);
+        SDL_SetWindowTitle(window, wintitle);
+                
        // Randomly place the player in a corner
        int playerx, playery;
        switch (rand()%4)
@@ -145,7 +149,7 @@ PlayGameState::PlayGameState(int m_level, GameBoard* m_board, int m_playerx, int
        playery = m_playery;
 }
-State* PlayGameState::operator() (SDL_Renderer* renderer)
+State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Event e;
        
@@ -216,6 +220,8 @@ State* PlayGameState::operator() (SDL_Renderer* renderer)
                                                }
                                        
                                        case SDLK_ESCAPE:
+                                                SDL_SetWindowTitle(window, "");
+                                                
                                                std::ifstream exists(getDataFile());
                                                if (exists)
                                                {
diff --git a/gamestate.h b/gamestate.h
index 815bc73..3c77ba9 100644
--- a/gamestate.h
+++ b/gamestate.h

@@ -6,7 +6,7 @@
 class GameState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 #endif
 \ No newline at end of file
diff --git a/hslist.cpp b/hslist.cpp
index 5ebface..a0debd7 100644
--- a/hslist.cpp
+++ b/hslist.cpp

@@ -251,7 +251,7 @@ SDL_Surface* GlobalHighscoreList::render()
        }
 }
-State* ChooseHighscoreListState::operator() (SDL_Renderer* renderer)
+State* ChooseHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* background = loadImage(renderer, "resources/chl.bmp");
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
@@ -292,7 +292,7 @@ State* ChooseHighscoreListState::operator() (SDL_Renderer* renderer)
        }
 }
-State* DisplayLocalHighscoreListState::operator() (SDL_Renderer* renderer)
+State* DisplayLocalHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
        
@@ -338,7 +338,7 @@ State* DisplayLocalHighscoreListState::operator() (SDL_Renderer* renderer)
        }
 }
-State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Renderer* renderer)
+State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
        
@@ -396,7 +396,7 @@ State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Renderer* render
        }
 }
-State* DisplayGlobalHighscoreListState::operator() (SDL_Renderer* renderer)
+State* DisplayGlobalHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
        
@@ -508,7 +508,7 @@ EnterHighscoreState::EnterHighscoreState(int level)
        this->level = level;
 }
-State* EnterHighscoreState::operator() (SDL_Renderer* renderer)
+State* EnterHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
        
@@ -624,7 +624,7 @@ NewHighscoreState::NewHighscoreState(Highscore* h)
        this->h = h;
 }
-State* NewHighscoreState::operator() (SDL_Renderer* renderer)
+State* NewHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
        
diff --git a/hslist.h b/hslist.h
index c1db137..8d450af 100644
--- a/hslist.h
+++ b/hslist.h

@@ -43,22 +43,22 @@ class GlobalHighscoreList : public HighscoreList {
 class ChooseHighscoreListState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 class DisplayLocalHighscoreListState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 class DisplayAndReturnLocalHighscoreListState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 class DisplayGlobalHighscoreListState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
                
        protected:
                SDL_Surface* list_s;
@@ -73,7 +73,7 @@ class DisplayGlobalHighscoreListState : public State {
 class EnterHighscoreState : public State {
        public:
                EnterHighscoreState(int level);
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
                
        private:
                int level;
@@ -85,7 +85,7 @@ class EnterHighscoreState : public State {
 class NewHighscoreState : public State {
        public:
                NewHighscoreState(Highscore* h);
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
                
        private:
                Highscore* h;
diff --git a/mazeoflife.cpp b/mazeoflife.cpp
index fda6f74..da19908 100644
--- a/mazeoflife.cpp
+++ b/mazeoflife.cpp

@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
        State* state = new TitleState();
        while (state != NULL)
        {
-                state = (*state)(renderer);
+                state = (*state)(window, renderer);
        }
        
        SDL_DestroyRenderer(renderer);
diff --git a/state.h b/state.h
index 2d6f804..5e8c4e7 100644
--- a/state.h
+++ b/state.h

@@ -6,7 +6,7 @@
 class State
 {
        public:
-                virtual State* operator() (SDL_Renderer* renderer) {return NULL;};
+                virtual State* operator() (SDL_Window* window, SDL_Renderer* renderer) {return NULL;};
 };
 #endif
 \ No newline at end of file
diff --git a/titlestate.cpp b/titlestate.cpp
index bf966ea..2b85fbe 100644
--- a/titlestate.cpp
+++ b/titlestate.cpp

@@ -3,7 +3,7 @@
 #include "gamestate.h"
 #include "hslist.h"
-State* TitleState::operator() (SDL_Renderer* renderer)
+State* TitleState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* background = loadImage(renderer, "resources/title.bmp");
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
@@ -45,7 +45,7 @@ State* TitleState::operator() (SDL_Renderer* renderer)
        }
 }
-State* HowToPlayState::operator() (SDL_Renderer* renderer)
+State* HowToPlayState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* background = loadImage(renderer, "resources/htp1.bmp");
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
@@ -89,7 +89,7 @@ State* HowToPlayState::operator() (SDL_Renderer* renderer)
        }
 }
-State* HowToPlayPageTwoState::operator() (SDL_Renderer* renderer)
+State* HowToPlayPageTwoState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
        SDL_Texture* background = loadImage(renderer, "resources/htp2.bmp");
        SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
diff --git a/titlestate.h b/titlestate.h
index c7beb91..8e6ffbc 100644
--- a/titlestate.h
+++ b/titlestate.h

@@ -6,17 +6,17 @@
 class TitleState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 class HowToPlayState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 class HowToPlayPageTwoState : public State {
        public:
-                State* operator() (SDL_Renderer* renderer);
+                State* operator() (SDL_Window* window, SDL_Renderer* renderer);
 };
 #endif
 \ No newline at end of file