6 files changed, 147 insertions, 147 deletions

@@ -22,12 +22,12 @@ class GameBoard {
                 void render(SDL_Renderer* renderer, int level) const;
                 bool isObstructed(int x, int y) const;
     bool operator<(const GameBoard& other) const;
-                
+
         private:
     void initialize(int level);
     int solve(int playerx, int playery) const;
     std::string dump() const;
-    
+
     std::bitset<WIDTH*HEIGHT> blocks;
     std::bitset<WIDTH*HEIGHT> updateable;
     int oldx;
@@ -38,7 +38,7 @@ class LoadGameState : public State {
         public:
                 LoadGameState(int level);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         private:
                 int level;
 };
@@ -47,7 +47,7 @@ class PlayGameState : public State {
         public:
                 PlayGameState(int level, GameBoard* board, int playerx, int playery);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-        
+
         private:
                 bool move(int x, int y);
                 int level;
@@ -111,7 +111,7 @@ 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)
@@ -121,11 +121,11 @@ State* LoadGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                 case 2: playerx = WIDTH-2; playery = HEIGHT-2; break;
                 case 3: playerx = WIDTH-2; playery = 1; break;
         }
-        
+
         // Display the level number
         setRendererDeadColor(renderer, level);
         SDL_RenderClear(renderer);
-        
+
         TTF_Font* font = loadFont(100);
         SDL_Color fontColor = {0, 0, 0, 0};
         char levelnum[8];
@@ -133,21 +133,21 @@ State* LoadGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
         SDL_Surface* dispsurf = TTF_RenderText_Solid(font, levelnum, fontColor);
         SDL_Texture* disptext = SDL_CreateTextureFromSurface(renderer, dispsurf);
         SDL_FreeSurface(dispsurf);
-        
+
         SDL_Rect pos;
         SDL_QueryTexture(disptext, NULL, NULL, &pos.w, &pos.h);
         pos.x = 240-(pos.w/2);
         pos.y = 240-(pos.h/2);
-        
+
         SDL_RenderCopy(renderer, disptext, NULL, &pos);
         SDL_RenderPresent(renderer);
-        
+
         // Do 50 gens of Conway
         GameBoard* board = new GameBoard(level, playerx, playery);
-        
+
         // Wait a bit
         SDL_Delay(500);
-        
+
         // Start the level
         return new PlayGameState(level, board, playerx, playery);
 }
@@ -163,15 +163,15 @@ PlayGameState::PlayGameState(int m_level, GameBoard* m_board, int m_playerx, int
 State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Event e;
-        
+
         for (;;)
         {
                 // Tick board
                 board->tick(playerx, playery);
-                
+
                 // Paint board
                 board->render(renderer, level);
-                
+
                 // Paint event
                 SDL_Rect block;
                 block.w = 16;
@@ -180,15 +180,15 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                 block.y = 15*16;
                 SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255);
                 SDL_RenderFillRect(renderer, &block);
-                
+
                 // Paint player
                 block.x = playerx*16;
                 block.y = playery*16;
                 SDL_SetRenderDrawColor(renderer, 255, 255, 0, 255);
                 SDL_RenderFillRect(renderer, &block);
-                
+
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -205,7 +205,7 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                                                 } else {
                                                         break;
                                                 }
-                                                
+
                                         case SDLK_RIGHT:
                                                 if (move(playerx+1, playery))
                                                 {
@@ -213,7 +213,7 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                                                 } else {
                                                         break;
                                                 }
-                                                
+
                                         case SDLK_UP:
                                                 if (move(playerx, playery-1))
                                                 {
@@ -221,7 +221,7 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                                                 } else {
                                                         break;
                                                 }
-                                        
+
                                         case SDLK_DOWN:
                                                 if (move(playerx, playery+1))
                                                 {
@@ -229,10 +229,10 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                                                 } else {
                                                         break;
                                                 }
-                                        
+
                                         case SDLK_ESCAPE:
                                                 SDL_SetWindowTitle(window, "");
-                                                
+
                                                 std::ifstream exists(getDataFile());
                                                 if (exists)
                                                 {
@@ -278,7 +278,7 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
                                 }
                         }
                 }
-                
+
                 SDL_Delay(5);
         }
 }
@@ -286,7 +286,7 @@ State* PlayGameState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 bool PlayGameState::move(int x, int y)
 {
         wrap(&x, &y);
-        
+
         // Are we at the event?
         if ((x==15)&&(y==15))
         {
@@ -299,7 +299,7 @@ bool PlayGameState::move(int x, int y)
                 playerx = x;
                 playery = y;
         }
-        
+
         return false;
 }
 
@@ -311,12 +311,12 @@ GameBoard::GameBoard(int level, int playerx, int playery)
     updateable.set();
     oldx = playerx;
     oldy = playery;
-    
+
     for (int i=0; i<50; i++)
     {
       tick(playerx, playery);
     }
-    
+
     int states = solve(playerx, playery);
     if (states != 0)
     {
@@ -341,7 +341,7 @@ void GameBoard::tick(int playerx, int playery)
         int tdy = oldy+dy;
         wrap(&tdx, &tdy);
         tempdateable.set(tdx+tdy*WIDTH);
-        
+
         tdx = playerx+dx;
         tdy = playery+dy;
         wrap(&tdx, &tdy);
@@ -349,10 +349,10 @@ void GameBoard::tick(int playerx, int playery)
       }
     }
   }
-  
+
   oldx = playerx;
   oldy = playery;
-  
+
   updateable.reset();
 
         for (int y=0;y<HEIGHT;y++)
@@ -381,7 +381,7 @@ void GameBoard::tick(int playerx, int playery)
                         } else {
                                 blocks[x+y*WIDTH] = (neighbors == 3);
                         }
-      
+
       if (temp[x+y*WIDTH] != blocks[x+y*WIDTH])
       {
         for (int dy = -1; dy <= 1; dy++)
@@ -404,21 +404,21 @@ void GameBoard::render(SDL_Renderer* renderer, int level) const
         SDL_Rect block;
         block.w = 16;
         block.h = 16;
-        
+
         for (int y=0; y<HEIGHT; y++)
         {
                 for (int x=0; x<WIDTH; x++)
                 {
                         block.x = x*16;
                         block.y = y*16;
-                        
+
                         if (blocks[x+y*WIDTH])
                         {
                                 setRendererAliveColor(renderer, level);
                         } else {
                                 setRendererDeadColor(renderer, level);
                         }
-                        
+
                         SDL_RenderFillRect(renderer, &block);
                 }
         }
@@ -436,7 +436,7 @@ void GameBoard::initialize(int level)
                 for (int x=0; x<WIDTH; x++)
                 {
                         blocks[x+y*WIDTH] = false;
-                        
+
                         switch (level/10+1)
                         {
                                 case 1:
@@ -464,7 +464,7 @@ void GameBoard::initialize(int level)
                         }
                 }
         }
-        
+
         blocks[15+15*WIDTH] = false;
 }
 
@@ -477,7 +477,7 @@ bool GameBoard::operator<(const GameBoard& other) const
       return other.blocks[i];
     }
   }
-  
+
   return false;
 }
 
@@ -486,32 +486,32 @@ int GameBoard::solve(int playerx, int playery) const
   std::deque<std::tuple<int, int, GameBoard, int>> search;
   std::set<std::tuple<int, int, GameBoard>> done;
   search.push_front(std::make_tuple(playerx, playery, *this, 0));
-  
+
   bool exists = false;
   while (!search.empty())
   {
     auto cur = search.front();
     search.pop_front();
-    
+
     int cpx = std::get<0>(cur);
     int cpy = std::get<1>(cur);
     GameBoard& cbr = std::get<2>(cur);
     int cns = std::get<3>(cur);
-    
+
     auto cdn = std::make_tuple(cpx, cpy, cbr);
     done.insert(cdn);
-    
+
     if (((cpx == 15) && ((cpy == 14) || (cpy == 16))) || ((cpy == 15) && ((cpx == 14) || (cpx == 16))))
     {
       exists = true;
       break;
     }
-    
+
     if (cns >= 100)
     {
       continue;
     }
-    
+
     GameBoard immnext {cbr};
     immnext.tick(cpx, cpy);
     if (immnext.blocks != cbr.blocks)
@@ -519,30 +519,30 @@ int GameBoard::solve(int playerx, int playery) const
       if (done.count(std::make_tuple(cpx, cpy, immnext)) == 0)
       {
         search.push_front(std::make_tuple(cpx, cpy, immnext, cns));
-        
+
         continue;
       }
     }
-    
+
     std::vector<std::pair<int, int>> dirchanges {{cpx-1,cpy}, {cpx,cpy-1}, {cpx+1,cpy}, {cpx,cpy+1}};
     std::sort(std::begin(dirchanges), std::end(dirchanges), [] (const std::pair<int, int>& lhs, const std::pair<int, int>& rhs) {
       int lhd = sqrt(pow(15 - lhs.first, 2.0) + pow(15 - lhs.second, 2.0));
       int rhd = sqrt(pow(15 - rhs.first, 2.0) + pow(15 - rhs.second, 2.0));
-      
+
       return lhd > rhd;
     });
-    
+
     for (auto& dirchange : dirchanges)
     {
       GameBoard next {cbr};
       int npx = cpx + dirchange.first;
       int npy = cpy + dirchange.second;
       wrap(&npx, &npy);
-      
+
       if (!next.isObstructed(npx, npy))
       {
         next.tick(npx, npy);
-      
+
         if (done.count(std::make_tuple(npx, npy, next)) == 0)
         {
           search.push_front(std::make_tuple(npx, npy, next, cns+1));
@@ -550,7 +550,7 @@ int GameBoard::solve(int playerx, int playery) const
       }
     }
   }
-  
+
   if (exists)
   {
     return done.size();
@@ -568,6 +568,6 @@ std::string GameBoard::dump() const
     int chunk = (8 * blocks[i*4]) + (4 * blocks[i*4+1]) + (2 * blocks[i*4+2]) + blocks[i*4+3];
     output << chunk;
   }
-  
+
   return output.str();
 }
@@ -40,7 +40,7 @@ SDL_Surface* HighscoreList::render()
         for (hslist_t::iterator it = hslist.begin(); it != hslist.end(); ++it, ++i)
         {
                 Highscore* h = *it;
-                
+
                 int posw, posh;
         char pos[4]; // 2 max characters in rank plus the colon at the end, plus terminator
         sprintf(pos, "%d:", h->getRank());
@@ -196,12 +196,12 @@ int LocalHighscoreList::addHighscore(Highscore* h)
         hslist.push_back(h);
         std::sort(hslist.begin(), hslist.end(), hslist_comp_i);
         resetRanks(hslist);
-        
+
         if (hslist.size() > 10)
         {
                 hslist.resize(10);
         }
-        
+
         return h->getRank();
 }
 
@@ -236,7 +236,7 @@ GlobalHighscoreList::GlobalHighscoreList()
 GlobalHighscoreList::GlobalHighscoreList(Highscore* h)
 {
         fail = false;
-        
+
         try
         {
                 IPaddress ipaddress;
@@ -302,7 +302,7 @@ GlobalHighscoreList::GlobalHighscoreList(Highscore* h)
                         this->hslist.push_back(h);
                         std::sort(this->hslist.begin(), this->hslist.end(), hslist_comp_i);
                         resetRanks(this->hslist);
-        
+
                         if (this->hslist.size() > 10)
                         {
                                 this->hslist.resize(10);
@@ -345,14 +345,14 @@ State* ChooseHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* r
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_RenderClear(renderer);
                 SDL_RenderCopy(renderer, background, NULL, NULL);
                 applyTexture(renderer, pointer, 127, selection==0?306:(selection==1?336:396));
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -383,7 +383,7 @@ State* ChooseHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* r
 State* DisplayLocalHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
-        
+
         LocalHighscoreList* lhl = new LocalHighscoreList();
         SDL_Surface* list_s = lhl->render();
         SDL_Color fontColor = {0, 0, 0, 0};
@@ -396,12 +396,12 @@ State* DisplayLocalHighscoreListState::operator() (SDL_Window* window, SDL_Rende
         SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
         SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
         SDL_FreeSurface(options_s);
-        
+
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
@@ -409,7 +409,7 @@ State* DisplayLocalHighscoreListState::operator() (SDL_Window* window, SDL_Rende
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 applyTexture(renderer, pointer, 137, 449);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -429,7 +429,7 @@ State* DisplayLocalHighscoreListState::operator() (SDL_Window* window, SDL_Rende
 State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
-        
+
         LocalHighscoreList* lhl = new LocalHighscoreList();
         SDL_Surface* list_s = lhl->render();
         SDL_Color fontColor = {0, 0, 0, 0};
@@ -442,13 +442,13 @@ State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Window* window,
         SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
         SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
         SDL_FreeSurface(options_s);
-        
+
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
@@ -456,7 +456,7 @@ State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Window* window,
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 applyTexture(renderer, pointer, selection==0?52:225, 447);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -486,11 +486,11 @@ State* DisplayAndReturnLocalHighscoreListState::operator() (SDL_Window* window,
 State* DisplayGlobalHighscoreListState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
-        
+
         // Display loading message
         SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
         SDL_RenderClear(renderer);
-        
+
         SDL_Surface* list_s = SDL_CreateRGBSurface(0, 480, 480, 32, 0,0,0,0);
         Uint32 bgColor = SDL_MapRGB(list_s->format, 255, 255, 255);
         SDL_FillRect(list_s, NULL, bgColor);
@@ -511,18 +511,18 @@ State* DisplayGlobalHighscoreListState::operator() (SDL_Window* window, SDL_Rend
         SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
         SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
         SDL_FreeSurface(options_s);
-        
+
         list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         m = SDL_CreateMutex();
-        
+
         // Start downloading scores
         SDL_CreateThread(&LoadHighscoreList, "LoadHighscoreList", this);
-        
+
         // Parse keyboard events
         SDL_Event e;
-        
+
         for (;;)
         {
                 if (SDL_LockMutex(m) == 0)
@@ -541,35 +541,35 @@ State* DisplayGlobalHighscoreListState::operator() (SDL_Window* window, SDL_Rend
                                 SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
                                 SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
                                 SDL_FreeSurface(options_s);
-        
+
                                 list = SDL_CreateTextureFromSurface(renderer, list_s);
                                 SDL_FreeSurface(list_s);
-                        
+
                                 lhl = NULL;
                         }
-                        
+
                         SDL_UnlockMutex(m);
                 }
-                
+
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
                 SDL_RenderClear(renderer);
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 applyTexture(renderer, pointer, 137, 449);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
                         {
                                 SDL_DestroyMutex(m);
-                                
+
                                 return NULL;
                         } else if (e.type == SDL_KEYDOWN)
                         {
                                 if (e.key.keysym.sym == SDLK_RETURN)
                                 {
                                         SDL_DestroyMutex(m);
-                                        
+
                                         return new ChooseHighscoreListState();
                                 }
                         }
@@ -583,7 +583,7 @@ int DisplayGlobalHighscoreListState::LoadHighscoreList(void* pParam)
         if (SDL_LockMutex(parent->m) == 0)
         {
                 parent->lhl = new GlobalHighscoreList();
-                
+
                 SDL_UnlockMutex(parent->m);
         } else {
                 printf("Couldn't lock mutex: %s\n", SDL_GetError());
@@ -598,16 +598,16 @@ EnterHighscoreState::EnterHighscoreState(int level)
 State* EnterHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
-        
+
         // Render highscore list
         LocalHighscoreList* lhl = new LocalHighscoreList();
         char* emp = new char[1];
         emp[0] = 0;
         Highscore* h = new Highscore(emp, level);
         int newpos = lhl->addHighscore(h);
-        
+
         SDL_Surface* list_s = lhl->render();
-        
+
         SDL_Color fontColor = {0, 0, 0, 0};
         SDL_Surface* title = TTF_RenderText_Blended(loadFont(40), "New Highscore!", fontColor);
         SDL_Rect tSpace = {240-(title->w/2), 0, title->w, title->h};
@@ -621,13 +621,13 @@ State* EnterHighscoreState::operator() (SDL_Window* window, SDL_Renderer* render
         SDL_Rect oSpace = {240-(text->w/2), 440, text->w, text->h};
         SDL_BlitSurface(text, NULL, list_s, &oSpace);
         SDL_FreeSurface(text);
-        
+
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
 
         int selection = 0;
         SDL_Event e;
-        
+
         int posw, posh;
     char pos[3]; // 2 max characters in rank plus the colon at the end
         sprintf(pos, "%d:", newpos);
@@ -642,7 +642,7 @@ State* EnterHighscoreState::operator() (SDL_Window* window, SDL_Renderer* render
         rntSpace.h = newName_s->h;
         newName = SDL_CreateTextureFromSurface(renderer, newName_s);
         SDL_FreeSurface(newName_s);
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
@@ -651,12 +651,12 @@ State* EnterHighscoreState::operator() (SDL_Window* window, SDL_Renderer* render
                 SDL_Rect eSpace = {0, newpos*40, 480, 40};
                 SDL_SetRenderDrawColor(renderer, 255, 255, 0, 255);
                 SDL_RenderFillRect(renderer, &eSpace);
-        
+
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 SDL_RenderCopy(renderer, newName, NULL, &rntSpace);
-                
+
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -682,7 +682,7 @@ State* EnterHighscoreState::operator() (SDL_Window* window, SDL_Renderer* render
                                         Highscore* h2 = new Highscore(hsname, level);
                                         lhl->addHighscore(h2);
                                         lhl->writeHighscores();
-                                        
+
                                         return new NewHighscoreState(h2);
                                 }
                         } else if (e.type == SDL_TEXTINPUT)
@@ -714,17 +714,17 @@ NewHighscoreState::NewHighscoreState(Highscore* h)
 State* NewHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
-        
+
         // Render highscore list
         LocalHighscoreList* lhl = new LocalHighscoreList();
         SDL_Surface* list_s = lhl->render();
-        
+
         SDL_Color fontColor = {0, 0, 0, 0};
         SDL_Surface* title = TTF_RenderText_Blended(loadFont(40), "New Highscore!", fontColor);
         SDL_Rect tSpace = {240-(title->w/2), 0, title->w, title->h};
         SDL_BlitSurface(title, NULL, list_s, &tSpace);
         SDL_FreeSurface(title);
-        
+
         SDL_Surface* options_s = SDL_LoadBMP("resources/hlo_passartm.bmp");
         SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
         SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
@@ -732,10 +732,10 @@ State* NewHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer
 
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
@@ -744,11 +744,11 @@ State* NewHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer
                 SDL_Rect eSpace = {0, h->getRank()*40, 480, 40};
                 SDL_SetRenderDrawColor(renderer, 255, 255, 0, 255);
                 SDL_RenderFillRect(renderer, &eSpace);
-        
+
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 applyTexture(renderer, pointer, selection==0?13:(selection==1?138:284), 448);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -798,30 +798,30 @@ State* SubmitHighscoreState::operator() (SDL_Window* window, SDL_Renderer* rende
         SDL_Rect tSpace = {240-(title->w/2), 0, title->w, title->h};
         SDL_BlitSurface(title, NULL, list_s, &tSpace);
         SDL_FreeSurface(title);
-        
+
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         // Start submitting score
         m = SDL_CreateMutex();
         SDL_CreateThread(&SubmitHighscore, "SubmitHighscore", this);
-        
+
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
                 SDL_RenderClear(renderer);
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 SDL_RenderPresent(renderer);
-                
+
                 if (SDL_LockMutex(m) == 0)
                 {
                         if (lhl != NULL)
                         {
                                 SDL_UnlockMutex(m);
                                 SDL_DestroyMutex(m);
-                                
+
                                 if (lhl->didFail())
                                 {
                                         return new FailedSubmittingHighscoreState(h);
@@ -832,13 +832,13 @@ State* SubmitHighscoreState::operator() (SDL_Window* window, SDL_Renderer* rende
                                 SDL_UnlockMutex(m);
                         }
                 }
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
                         {
                                 SDL_DestroyMutex(m);
-                                
+
                                 return NULL;
                         }
                 }
@@ -851,7 +851,7 @@ int SubmitHighscoreState::SubmitHighscore(void* pParam)
         if (SDL_LockMutex(parent->m) == 0)
         {
                 parent->lhl = new GlobalHighscoreList(parent->h);
-                
+
                 SDL_UnlockMutex(parent->m);
         } else {
                 printf("Could not lock mutex: %s\n", SDL_GetError());
@@ -875,7 +875,7 @@ State* FailedSubmittingHighscoreState::operator() (SDL_Window* window, SDL_Rende
         SDL_Rect tSpace = {240-(text->w/2), 240-(text->h/2), text->w, text->h};
         SDL_BlitSurface(text, NULL, list_s, &tSpace);
         SDL_FreeSurface(text);
-        
+
         SDL_Surface* title = TTF_RenderText_Blended(loadFont(40), "Highscore List", fontColor);
         SDL_Rect aSpace = {240-(title->w/2), 0, title->w, title->h};
         SDL_BlitSurface(title, NULL, list_s, &aSpace);
@@ -885,14 +885,14 @@ State* FailedSubmittingHighscoreState::operator() (SDL_Window* window, SDL_Rende
         SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
         SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
         SDL_FreeSurface(options_s);
-        
+
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
@@ -900,7 +900,7 @@ State* FailedSubmittingHighscoreState::operator() (SDL_Window* window, SDL_Rende
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 applyTexture(renderer, pointer, selection==0?13:(selection==1?138:284), 448);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -937,44 +937,44 @@ SubmittedHighscoreState::SubmittedHighscoreState(GlobalHighscoreList* lhl, Highs
 State* SubmittedHighscoreState::operator() (SDL_Window* window, SDL_Renderer* renderer)
 {
         SDL_Surface* list_s = lhl->render();
-        
+
         SDL_Color fontColor = {0, 0, 0, 0};
         SDL_Surface* title = TTF_RenderText_Blended(loadFont(40), "Highscore List", fontColor);
         SDL_Rect tSpace = {240-(title->w/2), 0, title->w, title->h};
         SDL_BlitSurface(title, NULL, list_s, &tSpace);
         SDL_FreeSurface(title);
-        
+
         SDL_Surface* options_s = SDL_LoadBMP("resources/hlo_paartm.bmp");
         SDL_Rect oSpace = {0, 440, options_s->w, options_s->h};
         SDL_BlitSurface(options_s, NULL, list_s, &oSpace);
         SDL_FreeSurface(options_s);
-        
+
         SDL_Texture* list = SDL_CreateTextureFromSurface(renderer, list_s);
         SDL_FreeSurface(list_s);
-        
+
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
         int selection = 0;
         SDL_Event e;
-        
+
         int newpos = h->getRank();
         if (newpos > 10)
         {
                 newpos = 10;
         }
-        
+
         for (;;)
         {
                 SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
                 SDL_RenderClear(renderer);
-                
+
                 SDL_Rect eSpace = {0, newpos*40, 480, 40};
                 SDL_SetRenderDrawColor(renderer, 255, 255, 0, 255);
                 SDL_RenderFillRect(renderer, &eSpace);
-                
+
                 SDL_RenderCopy(renderer, list, NULL, NULL);
                 applyTexture(renderer, pointer, selection==0?52:225, 447);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -61,13 +61,13 @@ class DisplayAndReturnLocalHighscoreListState : public State {
 class DisplayGlobalHighscoreListState : public State {
         public:
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         protected:
                 SDL_Surface* list_s;
                 SDL_Texture* list;
                 GlobalHighscoreList* lhl;
                 SDL_mutex* m;
-                
+
         private:
                 static int LoadHighscoreList(void* pParam);
 };
@@ -76,7 +76,7 @@ class EnterHighscoreState : public State {
         public:
                 EnterHighscoreState(int level);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         private:
                 int level;
                 int lp;
@@ -88,7 +88,7 @@ class NewHighscoreState : public State {
         public:
                 NewHighscoreState(Highscore* h);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         private:
                 Highscore* h;
 };
@@ -97,12 +97,12 @@ class SubmitHighscoreState : public State {
         public:
                 SubmitHighscoreState(Highscore* h);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         protected:
                 Highscore* h;
                 SDL_mutex* m;
                 GlobalHighscoreList* lhl;
-                
+
         private:
                 static int SubmitHighscore(void* pParam);
 };
@@ -111,7 +111,7 @@ class FailedSubmittingHighscoreState : public State {
         public:
                 FailedSubmittingHighscoreState(Highscore* h);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         private:
                 Highscore* h;
 };
@@ -120,7 +120,7 @@ class SubmittedHighscoreState : public State {
         public:
                 SubmittedHighscoreState(GlobalHighscoreList* lhl, Highscore* h);
                 State* operator() (SDL_Window* window, SDL_Renderer* renderer);
-                
+
         private:
                 GlobalHighscoreList* lhl;
                 Highscore* h;
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
         srand(time(NULL));
 
         if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1)
-        { 
+        {
                 printf("Could not initialize SDL: %s.\n", SDL_GetError());
                 exit(-1);
         }
@@ -29,17 +29,17 @@ int main(int argc, char *argv[])
                 printf("Cound not initalize SDL_net: %s.\n", SDLNet_GetError());
                 exit(-1);
         }
-        
+
         SDL_Window* window = SDL_CreateWindow("Maze of Life", 100, 100, 480, 480, SDL_WINDOW_SHOWN);
         if (window == NULL)
         {
                 std::cout << "SDL_CreateWindow Error: " << SDL_GetError() << std::endl;
                 return 1;
         }
-        
+
         SDL_Surface* icon = SDL_LoadBMP("resources/icon.bmp");
         SDL_SetWindowIcon(window, icon);
-        
+
         SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
         if (renderer == NULL)
         {
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
         {
                 state = (*state)(window, renderer);
         }
-        
+
         SDL_DestroyRenderer(renderer);
         SDL_DestroyWindow(window);
         SDLNet_Quit();
@@ -9,14 +9,14 @@ State* TitleState::operator() (SDL_Window* window, SDL_Renderer* renderer)
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_RenderClear(renderer);
                 SDL_RenderCopy(renderer, background, NULL, NULL);
                 applyTexture(renderer, pointer, 136, selection==0?316:(selection==1?350:(selection==2?381:417)));
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -51,14 +51,14 @@ State* HowToPlayState::operator() (SDL_Window* window, SDL_Renderer* renderer)
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_RenderClear(renderer);
                 SDL_RenderCopy(renderer, background, NULL, NULL);
                 applyTexture(renderer, pointer, selection==0?74:216, 430);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -95,14 +95,14 @@ State* HowToPlayPageTwoState::operator() (SDL_Window* window, SDL_Renderer* rend
         SDL_Texture* pointer = loadImage(renderer, "resources/pointer.bmp");
         int selection = 0;
         SDL_Event e;
-        
+
         for (;;)
         {
                 SDL_RenderClear(renderer);
                 SDL_RenderCopy(renderer, background, NULL, NULL);
                 applyTexture(renderer, pointer, selection==0?45:238, 430);
                 SDL_RenderPresent(renderer);
-                
+
                 while (SDL_PollEvent(&e))
                 {
                         if (e.type == SDL_QUIT)
@@ -11,7 +11,7 @@ void wrap(int* x, int* y)
         {
                 *x = *x-WIDTH;
         }
-  
+
   if (*y < 0)
         {
                 *y = HEIGHT-(0-*y);
@@ -53,10 +53,10 @@ SDL_Texture* loadImage(SDL_Renderer* renderer, std::string file)
                 std::cout << SDL_GetError() << std::endl;
                 return NULL;
         }
-        
+
         SDL_Texture* texture = SDL_CreateTextureFromSurface(renderer, surface);
         SDL_FreeSurface(surface);
-        
+
         return texture;
 }
 
@@ -66,6 +66,6 @@ void applyTexture(SDL_Renderer* renderer, SDL_Texture* tex, int x, int y)
         pos.x = x;
         pos.y = y;
         SDL_QueryTexture(tex, NULL, NULL, &pos.w, &pos.h);
-        
+
         SDL_RenderCopy(renderer, tex, NULL, &pos);
 }
\ No newline at end of file