Modernized C++ a bit (and removed global highscores) HEAD master

1 files changed, 73 insertions, 896 deletions

@@ -5,946 +5,123 @@
 
 #include <algorithm>
 #include <fstream>
+#include <memory>
 #include <sstream>
 
 #include "gamestate.h"
 #include "titlestate.h"
 #include "util.h"
 
-// We want to be able to sort Highscore objects in descending score order
-struct hslist_comp {
-  bool operator()(Highscore* lhs, Highscore* rhs) const {
-    return (lhs->getLevel() > rhs->getLevel());
-  }
-} hslist_comp_i;
+HighscoreList::HighscoreList(std::vector<Highscore> hslist) : hslist_(hslist) {
+  resetRanks();
+}
 
-// resetRanks : sets the rank of all Highscore objects in a hslist_t to their
-// (one-based) index in the list
-void resetRanks(hslist_t in) {
+void HighscoreList::resetRanks() {
   int i = 1;
-  for (hslist_t::iterator it = in.begin(); it != in.end(); ++it, ++i) {
-    ((Highscore*)*it)->setRank(i);
+  for (Highscore& hs : hslist_) {
+    hs.setRank(i++);
   }
 }
 
-SDL_Surface* HighscoreList::render() {
-  SDL_Surface* tmp = SDL_CreateRGBSurface(0, 480, 480, 32, 0, 0, 0, 0);
+surface_ptr HighscoreList::render() {
+  surface_ptr tmp =
+      surface_ptr(SDL_CreateRGBSurface(0, 480, 480, 32, 0, 0, 0, 0));
   Uint32 bgColor = SDL_MapRGB(tmp->format, 255, 255, 255);
-  SDL_FillRect(tmp, NULL, bgColor);
-  SDL_SetColorKey(tmp, SDL_TRUE, bgColor);
-  TTF_Font* posFont = loadFont(40);
-  TTF_Font* dataFont = loadFont(25);
+  SDL_FillRect(tmp.get(), NULL, bgColor);
+  SDL_SetColorKey(tmp.get(), SDL_TRUE, bgColor);
+  font_ptr posFont = loadFont(40);
+  font_ptr dataFont = loadFont(25);
   SDL_Color fontColor = {0, 0, 0, 0};
 
-  int i = 0;
-  for (hslist_t::iterator it = hslist.begin(); it != hslist.end(); ++it, ++i) {
-    Highscore* h = *it;
-
+  for (const Highscore& h : hslist_) {
     int posw, posh;
-    char pos[4];  // 2 max characters in rank plus the colon at the end, plus
-                  // terminator
-    sprintf(pos, "%d:", h->getRank());
-    TTF_SizeText(posFont, pos, &posw, &posh);
-    SDL_Rect posSpace = {0, (i + 1) * 40, posw, posh};
-    SDL_BlitSurface(TTF_RenderText_Blended(posFont, pos, fontColor), NULL, tmp,
-                    &posSpace);
+
+    std::ostringstream posstr;
+    posstr << h.getRank() << ":";
+
+    std::string pos = posstr.str();
+    TTF_SizeText(posFont.get(), pos.c_str(), &posw, &posh);
+    SDL_Rect posSpace = {0, h.getRank() * 40, posw, posh};
+    SDL_BlitSurface(
+        TTF_RenderText_Blended(posFont.get(), pos.c_str(), fontColor), NULL,
+        tmp.get(), &posSpace);
+
+    std::ostringstream namestr;
+    namestr << " " << h.getName();
 
     int namew, nameh;
-    char name[27];  // 25 max characters in username plus the space at the
-                    // beginning, plus terminator
-    sprintf(name, " %s", h->getName());
-    TTF_SizeText(dataFont, name, &namew, &nameh);
-    SDL_Rect nameSpace = {posw, (i + 1) * 40 + ((posh / 2) - (nameh / 2)),
+    std::string name = namestr.str();
+    TTF_SizeText(dataFont.get(), name.c_str(), &namew, &nameh);
+    SDL_Rect nameSpace = {posw, h.getRank() * 40 + ((posh / 2) - (nameh / 2)),
                           namew, nameh};
-    SDL_BlitSurface(TTF_RenderText_Blended(dataFont, name, fontColor), NULL,
-                    tmp, &nameSpace);
+    SDL_BlitSurface(
+        TTF_RenderText_Blended(dataFont.get(), name.c_str(), fontColor), NULL,
+        tmp.get(), &nameSpace);
 
     int lvlw, lvlh;
-    char lvl[11];  // 10 max characters in level (based off the fact that 2^32-1
-                   // is 10 characters long, and is the highest int), plus
-                   // terminator
-    sprintf(lvl, "%d", h->getLevel());
-    TTF_SizeText(dataFont, lvl, &lvlw, &lvlh);
-    SDL_Rect lvlSpace = {480 - lvlw, (i + 1) * 40 + ((posh / 2) - (nameh / 2)),
-                         lvlw, lvlh};
-    SDL_BlitSurface(TTF_RenderText_Blended(dataFont, lvl, fontColor), NULL, tmp,
-                    &lvlSpace);
+    std::string lvl = std::to_string(h.getLevel());
+    TTF_SizeText(dataFont.get(), lvl.c_str(), &lvlw, &lvlh);
+    SDL_Rect lvlSpace = {
+        480 - lvlw, h.getRank() * 40 + ((posh / 2) - (nameh / 2)), lvlw, lvlh};
+    SDL_BlitSurface(
+        TTF_RenderText_Blended(dataFont.get(), lvl.c_str(), fontColor), NULL,
+        tmp.get(), &lvlSpace);
   }
 
   return tmp;
 }
 
-hslist_t HighscoreList::getLocalHighscores() {
-  hslist_t temp;
+std::unique_ptr<HighscoreList> HighscoreList::GetLocalHighscores() {
+  std::vector<Highscore> hslist;
 
-  std::ifstream exists(getDataFile());
-  if (exists) {
-    FILE* hslist = fopen(getDataFile(), "r");
-    int scores;
-    fscanf(hslist, "%d%*c", &scores);
+  std::ifstream hsstream(getDataFile());
+  if (hsstream) {
+    int num_scores = 0;
+    hsstream >> num_scores;
 
-    for (int i = 0; i < scores; i++) {
-      int namelen;
-      char namelens[4];
-      char* name = (char*)calloc(25, sizeof(char));
+    for (int i = 0; i < num_scores; i++) {
+      std::string name;
       int score;
 
-      fscanf(hslist, "%d", &namelen);
-      sprintf(namelens, "%%%dc", namelen);
-      fscanf(hslist, namelens, name);
-      fscanf(hslist, "%d%*c", &score);
-
-      Highscore* h = new Highscore(name, score);
-      h->setRank(i + 1);
+      hsstream >> name;
+      hsstream >> score;
 
-      temp.push_back(h);
+      hslist.emplace_back(name, score);
     }
-
-    fclose(hslist);
   }
 
-  return temp;
+  return std::unique_ptr<HighscoreList>(new HighscoreList(hslist));
 }
 
-hslist_t HighscoreList::getGlobalHighscores() {
-  IPaddress ipaddress;
-
-  if (SDLNet_ResolveHost(&ipaddress, "other.fourisland.com", 80) == -1) {
-    printf("Could not resolve host \"other.fourisland.com\": %s\n",
-           SDLNet_GetError());
-    throw 1;
-  }
-
-  TCPsocket tcpsock = SDLNet_TCP_Open(&ipaddress);
-  if (!tcpsock) {
-    printf("Could not connect to host \"other.fourisland.com\": %s\n",
-           SDLNet_GetError());
-    throw 2;
-  }
-
-  const char* headers =
-      "GET /mol/hslist.php HTTP/1.1\nHost: other.fourisland.com\nUser-Agent: "
-      "Maze Of Life v3.0\nAccept: text/plain\nKeep-Alive: 300\nConnection: "
-      "keep-alive\n\n";
-  if (SDLNet_TCP_Send(tcpsock, headers, strlen(headers) + 1) <
-      strlen(headers)) {
-    printf("Connection closed by peer: %s\n", SDLNet_GetError());
-    throw 3;
-  }
-
-  std::stringstream download(std::stringstream::in | std::stringstream::out);
-  char hslist[1024];
-  SDLNet_TCP_Recv(tcpsock, hslist, 1024);
-  download << hslist;
-  SDLNet_TCP_Close(tcpsock);
-
-  char temps[256];
-  download.getline(temps, 256);
-  while (strlen(temps) != 1) {
-    download.getline(temps, 256);
-  }
-
-  hslist_t temp;
-  int scores;
-  download.getline(temps, 256);
-  if (sscanf(temps, "%d%*c", &scores) != 1) {
-    printf("Recieved data is of an invalid format: %s\n", temps);
-    throw 4;
-  }
-
-  for (int i = 0; i < scores; i++) {
-    int namelen;
-    char namelens[13];
-    char* name = (char*)calloc(25, sizeof(char));
-    int score;
-    download.getline(temps, 256);
-
-    if (sscanf(temps, "%d", &namelen) != 1) {
-      printf("Recieved data is of an invalid format (1-%d): %s\n", i, temps);
-      throw 4;
-    }
-
-    sprintf(namelens, "%%*d%%%dc", namelen);
-
-    if (sscanf(temps, namelens, name) != 1) {
-      printf("Recieved data is of an invalid format (2-%d): %s\n", i, temps);
-      throw 4;
-    }
-
-    sprintf(namelens, "%%*d%%*%dc%%d", namelen);
-
-    if (sscanf(temps, namelens, &score) != 1) {
-      printf("Recieved data is of an invalid format (3-%d): %s\n", i, temps);
-      throw 4;
-    }
-
-    Highscore* h = new Highscore(name, score);
-    h->setRank(i + 1);
-
-    temp.push_back(h);
-  }
-
-  return temp;
-}
-
-LocalHighscoreList::LocalHighscoreList() {
-  this->hslist = getLocalHighscores();
-}
-
-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();
-}
-
-void LocalHighscoreList::writeHighscores() {
-  FILE* hsfile = fopen(getDataFile(), "w");
-  fprintf(hsfile, "%d ", (int)this->hslist.size());
-
-  for (hslist_t::iterator it = hslist.begin(); it != this->hslist.end(); it++) {
-    Highscore* h = *it;
-
-    fprintf(hsfile, "%d%s%d ", (int)strlen(h->getName()), h->getName(),
-            h->getLevel());
-  }
-
-  fclose(hsfile);
-}
-
-GlobalHighscoreList::GlobalHighscoreList() {
-  fail = false;
-
-  try {
-    this->hslist = getGlobalHighscores();
-  } catch (int e) {
-    fail = true;
-  }
-}
-
-GlobalHighscoreList::GlobalHighscoreList(Highscore* h) {
-  fail = false;
-
-  try {
-    IPaddress ipaddress;
-
-    if (SDLNet_ResolveHost(&ipaddress, "other.fourisland.com", 80) == -1) {
-      printf("Could not resolve host \"other.fourisland.com\": %s\n",
-             SDLNet_GetError());
-      throw 1;
-    }
-
-    TCPsocket tcpsock = SDLNet_TCP_Open(&ipaddress);
-    if (!tcpsock) {
-      printf("Could not connect to host \"other.fourisland.com\": %s\n",
-             SDLNet_GetError());
-      throw 2;
-    }
-
-    char body[256];
-    sprintf(body, "name=%s&level=%d", h->getName(), h->getLevel());
-    char headers[256];
-    sprintf(
-        headers,
-        "POST /mol/hslist.php?add HTTP/1.1\nHost: "
-        "other.fourisland.com\nUser-Agent: Maze Of Life v2.0\nAccept: "
-        "text/plain\nKeep-Alive: 300\nConnection: keep-alive\nContent-Type: "
-        "application/x-www-form-urlencoded\nContent-Length: %d\n\n%s\n",
-        (int)strlen(body), body);
-    if (SDLNet_TCP_Send(tcpsock, headers, strlen(headers) + 1) <
-        strlen(headers)) {
-      printf("Connection closed by peer: %s\n", SDLNet_GetError());
-      throw 3;
-    }
-
-    std::stringstream download(std::stringstream::in | std::stringstream::out);
-    char hslist[1024];
-    SDLNet_TCP_Recv(tcpsock, hslist, 1024);
-    download << hslist;
-    SDLNet_TCP_Close(tcpsock);
-
-    char temps[256];
-    download.getline(temps, 256);
-    while (strlen(temps) != 1) {
-      download.getline(temps, 256);
-    }
-
-    int rank;
-    download.getline(temps, 256);
-    if (sscanf(temps, "%d%*c", &rank) != 1) {
-      printf("Recieved data is of an invalid format: %s\n", temps);
-      throw 4;
-    }
-
-    this->hslist = getGlobalHighscores();
-
-    if (this->hslist.empty()) {
-      printf(
-          "Global Highscore List cannot be empty after adding a score to "
-          "it.\n");
-      throw 5;
-    }
-
-    if (rank > 10) {
-      h->setRank(rank);
-
-      this->hslist[9] = h;
-    } else {
-      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);
-      }
-    }
-  } catch (int e) {
-    fail = true;
-  }
-}
-
-SDL_Surface* GlobalHighscoreList::render() {
-  if (fail) {
-    SDL_Surface* tmp = SDL_CreateRGBSurface(0, 480, 480, 32, 0, 0, 0, 0);
-    Uint32 bgColor = SDL_MapRGB(tmp->format, 255, 255, 255);
-    SDL_FillRect(tmp, NULL, bgColor);
-    SDL_SetColorKey(tmp, SDL_TRUE, bgColor);
-    TTF_Font* dataFont = loadFont(25);
-    SDL_Color fontColor = {0, 0, 0, 0};
-    SDL_Surface* text = TTF_RenderText_Blended(
-        dataFont, "Error retrieving highscores", fontColor);
-    SDL_Rect tSpace = {240 - (text->w / 2), 240 - (text->h / 2), text->w,
-                       text->h};
-    SDL_BlitSurface(text, NULL, tmp, &tSpace);
-
-    return tmp;
-  } else {
-    return super::render();
-  }
-}
-
-bool GlobalHighscoreList::didFail() { return fail; }
-
-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");
-  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) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if ((e.key.keysym.sym == SDLK_UP) && (selection != 0)) {
-          selection--;
-        } else if ((e.key.keysym.sym == SDLK_DOWN) && (selection != 2)) {
-          selection++;
-        } else if (e.key.keysym.sym == SDLK_RETURN) {
-          switch (selection) {
-            case 0:
-              return new DisplayLocalHighscoreListState();
-            case 1:
-              return new DisplayGlobalHighscoreListState();
-            case 2:
-              return new TitleState();
-          }
-        }
-      }
-    }
-  }
-}
-
-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};
-  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_rtm.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_Event e;
-
-  for (;;) {
-    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) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if (e.key.keysym.sym == SDLK_RETURN) {
-          return new ChooseHighscoreListState();
-        }
-      }
-    }
-  }
-}
-
-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};
-  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);
-
-  int selection = 0;
-  SDL_Event e;
-
-  for (;;) {
-    SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
-    SDL_RenderClear(renderer);
-    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) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if ((e.key.keysym.sym == SDLK_LEFT) && (selection != 0)) {
-          selection--;
-        } else if ((e.key.keysym.sym == SDLK_RIGHT) && (selection != 1)) {
-          selection++;
-        } else if (e.key.keysym.sym == SDLK_RETURN) {
-          switch (selection) {
-            case 0:
-              return new GameState();
-            case 1:
-              return new TitleState();
-          }
-        }
-      }
-    }
-  }
-}
-
-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);
-  SDL_SetColorKey(list_s, SDL_TRUE, bgColor);
-  TTF_Font* dataFont = loadFont(25);
-  SDL_Color fontColor = {0, 0, 0, 0};
-  SDL_Surface* text =
-      TTF_RenderText_Blended(dataFont, "Fetching highscores....", fontColor);
-  SDL_Rect aSpace = {240 - (text->w / 2), 240 - (text->h / 2), text->w,
-                     text->h};
-  SDL_BlitSurface(text, NULL, list_s, &aSpace);
-  SDL_FreeSurface(text);
-
-  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_rtm.bmp");
-  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) {
-      if (lhl != NULL) {
-        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_rtm.bmp");
-        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();
-        }
-      }
-    }
-  }
-}
-
-int DisplayGlobalHighscoreListState::LoadHighscoreList(void* pParam) {
-  DisplayGlobalHighscoreListState* parent =
-      ((DisplayGlobalHighscoreListState*)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());
-  }
-}
-
-EnterHighscoreState::EnterHighscoreState(int level) { this->level = 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};
-  SDL_BlitSurface(title, NULL, list_s, &tSpace);
-  SDL_FreeSurface(title);
-
-  this->lp = 0;
-  this->hsname = (char*)calloc(25, sizeof(char));
-
-  SDL_Surface* text =
-      TTF_RenderText_Blended(loadFont(25), "Enter Your Name", fontColor);
-  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);
-  char name[26];  // 25 max characters in username plus the space at the
-                  // beginning
-  sprintf(name, " %s", hsname);
-  SDL_Surface* newName_s =
-      TTF_RenderText_Blended(loadFont(25), name, fontColor);
-  TTF_SizeText(loadFont(40), pos, &posw, &posh);
-  SDL_Rect rntSpace;
-  rntSpace.x = posw;
-  rntSpace.y = newpos * 40 + ((posh / 2) - (newName_s->h / 2));
-  rntSpace.w = newName_s->w;
-  rntSpace.h = newName_s->h;
-  newName = SDL_CreateTextureFromSurface(renderer, newName_s);
-  SDL_FreeSurface(newName_s);
-
-  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);
-    SDL_RenderCopy(renderer, newName, NULL, &rntSpace);
-
-    SDL_RenderPresent(renderer);
-
-    while (SDL_PollEvent(&e)) {
-      if (e.type == SDL_QUIT) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if ((e.key.keysym.sym == SDLK_BACKSPACE) && (lp > 0)) {
-          hsname[--lp] = 0;
-
-          SDL_Color fontColor = {0, 0, 0, 0};
-          char name[26];  // 25 max characters in username plus the space at the
-                          // beginning
-          sprintf(name, " %s", hsname);
-          newName_s = TTF_RenderText_Blended(loadFont(25), name, fontColor);
-          rntSpace.w = newName_s->w;
-          rntSpace.h = newName_s->h;
-          newName = SDL_CreateTextureFromSurface(renderer, newName_s);
-          SDL_FreeSurface(newName_s);
-        } else if ((e.key.keysym.sym == SDLK_RETURN) && (hsname[0] != 0)) {
-          lhl = new LocalHighscoreList();
-          Highscore* h2 = new Highscore(hsname, level);
-          lhl->addHighscore(h2);
-          lhl->writeHighscores();
-
-          return new NewHighscoreState(h2);
-        }
-      } else if (e.type == SDL_TEXTINPUT) {
-        if (((*e.text.text & 0xFF80) == 0) &&
-            (*e.text.text >= 32 && *e.text.text < 127) && (lp < 25)) {
-          hsname[lp++] = *e.text.text & 0x7f;
-          hsname[lp] = 0;
-
-          SDL_Color fontColor = {0, 0, 0, 0};
-          char name[26];  // 25 max characters in username plus the space at the
-                          // beginning
-          sprintf(name, " %s", hsname);
-          newName_s = TTF_RenderText_Blended(loadFont(25), name, fontColor);
-          rntSpace.w = newName_s->w;
-          rntSpace.h = newName_s->h;
-          newName = SDL_CreateTextureFromSurface(renderer, newName_s);
-          SDL_FreeSurface(newName_s);
-        }
-      }
-    }
-  }
-}
-
-NewHighscoreState::NewHighscoreState(Highscore* h) { this->h = 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);
-  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);
-    SDL_RenderClear(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) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if ((e.key.keysym.sym == SDLK_LEFT) && (selection != 0)) {
-          selection--;
-        } else if ((e.key.keysym.sym == SDLK_RIGHT) && (selection != 2)) {
-          selection++;
-        } else if (e.key.keysym.sym == SDLK_RETURN) {
-          switch (selection) {
-            case 0:
-              return new GameState();
-            case 1:
-              return new SubmitHighscoreState(h);
-            case 2:
-              return new TitleState();
-          }
-        }
-      }
-    }
-  }
-}
-
-SubmitHighscoreState::SubmitHighscoreState(Highscore* h) { this->h = h; }
-
-State* SubmitHighscoreState::operator()(SDL_Window* window,
-                                        SDL_Renderer* 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);
-  SDL_SetColorKey(list_s, SDL_TRUE, bgColor);
-  TTF_Font* dataFont = loadFont(25);
-  SDL_Color fontColor = {0, 0, 0, 0};
-  SDL_Surface* text =
-      TTF_RenderText_Blended(dataFont, "Sending highscore....", fontColor);
-  SDL_Rect aSpace = {240 - (text->w / 2), 240 - (text->h / 2), text->w,
-                     text->h};
-  SDL_BlitSurface(text, NULL, list_s, &aSpace);
-  SDL_FreeSurface(text);
-
-  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_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);
-        } else {
-          return new SubmittedHighscoreState(lhl, h);
-        }
-      } else {
-        SDL_UnlockMutex(m);
-      }
-    }
-
-    while (SDL_PollEvent(&e)) {
-      if (e.type == SDL_QUIT) {
-        SDL_DestroyMutex(m);
+int HighscoreList::addHighscore(Highscore h) {
+  int i = 1;
 
-        return NULL;
-      }
+  for (const Highscore& cur_h : hslist_) {
+    if (h.getLevel() > cur_h.getLevel()) {
+      break;
     }
+    i++;
   }
-}
-
-int SubmitHighscoreState::SubmitHighscore(void* pParam) {
-  SubmitHighscoreState* parent = (SubmitHighscoreState*)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());
-  }
-}
-
-FailedSubmittingHighscoreState::FailedSubmittingHighscoreState(Highscore* h) {
-  this->h = h;
-}
-
-State* FailedSubmittingHighscoreState::operator()(SDL_Window* window,
-                                                  SDL_Renderer* 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);
-  SDL_SetColorKey(list_s, SDL_TRUE, bgColor);
-  TTF_Font* dataFont = loadFont(25);
-  SDL_Color fontColor = {0, 0, 0, 0};
-  SDL_Surface* text = TTF_RenderText_Blended(
-      dataFont, "Error submitting highscores", fontColor);
-  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);
-  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);
-  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);
-    SDL_RenderClear(renderer);
-    SDL_RenderCopy(renderer, list, NULL, NULL);
-    applyTexture(renderer, pointer,
-                 selection == 0 ? 13 : (selection == 1 ? 138 : 284), 448);
-    SDL_RenderPresent(renderer);
+  hslist_.push_back(h);
+  std::sort(hslist_.begin(), hslist_.end(),
+            [](const Highscore& lhs, const Highscore& rhs) {
+              return lhs.getLevel() > rhs.getLevel();
+            });
+  resetRanks();
 
-    while (SDL_PollEvent(&e)) {
-      if (e.type == SDL_QUIT) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if ((e.key.keysym.sym == SDLK_LEFT) && (selection != 0)) {
-          selection--;
-        } else if ((e.key.keysym.sym == SDLK_RIGHT) && (selection != 2)) {
-          selection++;
-        } else if (e.key.keysym.sym == SDLK_RETURN) {
-          switch (selection) {
-            case 0:
-              return new GameState();
-            case 1:
-              return new SubmitHighscoreState(h);
-            case 2:
-              return new TitleState();
-          }
-        }
-      }
-    }
+  if (hslist_.size() > 10) {
+    hslist_.resize(10);
   }
-}
 
-SubmittedHighscoreState::SubmittedHighscoreState(GlobalHighscoreList* lhl,
-                                                 Highscore* h) {
-  this->lhl = lhl;
-  this->h = h;
+  return i;
 }
 
-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;
+void HighscoreList::writeToFile() {
+  std::ofstream hsfile(getDataFile());
+  hsfile << hslist_.size() << std::endl;
 
-  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) {
-        return NULL;
-      } else if (e.type == SDL_KEYDOWN) {
-        if ((e.key.keysym.sym == SDLK_LEFT) && (selection != 0)) {
-          selection--;
-        } else if ((e.key.keysym.sym == SDLK_RIGHT) && (selection != 1)) {
-          selection++;
-        } else if (e.key.keysym.sym == SDLK_RETURN) {
-          switch (selection) {
-            case 0:
-              return new GameState();
-            case 1:
-              return new TitleState();
-          }
-        }
-      }
-    }
+  for (const Highscore& h : hslist_) {
+    hsfile << h.getName() << std::endl << h.getLevel() << std::endl;
   }
 }