Minor refactoring in the map list code

mmatyas · Sep 13, 2024 · 3c0399c · 3c0399c
1 parent 0a6169e
commit 3c0399c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/src/common/MapList.h b/src/common/MapList.h
@@ -53,23 +53,22 @@ class MapList
 
     std::string randomFilename() const;
 
-		//Sets/Gets if a map at the current map node is valid and can be loaded
-    void SetValid(bool fValid) {
+    /// Sets whether the current map is valid and can be loaded
+    void setValid(bool fValid) {
         (*current).second->fValid = fValid;
     }
-    bool GetValid() {
+    /// The current map is valid and can be loaded
+    bool isValid() const {
         return (*current).second->fValid;
     }
 
-		//TODO: use size?
-    bool IsEmpty() {
+    bool isEmpty() const {
         return maps.empty();
     }
-
-    int GetFilteredCount() {
+    size_t filteredCount() const {
         return iFilteredMapCount;
     }
-    int GetCount() {
+    size_t count() const {
         return maps.size();
     }
 
@@ -118,7 +117,7 @@ class MapList
 
 		std::multimap<std::string, MapListNode*>::iterator outercurrent;
 
-		short iFilteredMapCount;
+		size_t iFilteredMapCount;
 
 		std::multimap<std::string, MapListNode*>::iterator * mlnFilteredMaps;
 		std::multimap<std::string, MapListNode*>::iterator * mlnMaps;

diff --git a/src/leveleditor/leveleditor.cpp b/src/leveleditor/leveleditor.cpp
@@ -1088,15 +1088,15 @@ int editor_edit()
                     if (key == SDLK_PAGEUP) {
                         do {
 								maplist->prev(false);
-                        } while (!maplist->GetValid());
+                        } while (!maplist->isValid());
 
 							loadcurrentmap();
 						}
 
                     if (key == SDLK_PAGEDOWN) {
                         do {
 								maplist->next(false);
-                        } while (!maplist->GetValid());
+                        } while (!maplist->isValid());
 
 							loadcurrentmap();
 
@@ -1521,7 +1521,7 @@ int editor_edit()
 
 		}
 
-        if (maplist->GetValid()) {
+        if (maplist->isValid()) {
 			drawmap(false, TILESIZE);
         } else {
 			SDL_FillRect(screen, NULL, 0x0);
@@ -4804,7 +4804,7 @@ int clearMap()
 #ifdef _DEBUG
 void convertAll()
 {
-    for (int k = 0; k < maplist->GetCount(); k++) {
+    for (int k = 0; k < maplist->count(); k++) {
 		//g_map->convertMap();
 		g_map->saveMap(maplist->currentFilename());
 		maplist->next(false);

diff --git a/src/smw/GSMenu.cpp b/src/smw/GSMenu.cpp
@@ -1447,7 +1447,7 @@ void MenuState::update()
         //Write out all the map thumbnails for the map browser and filter editor
         std::map<std::string, MapListNode*>::iterator itr = maplist->GetIteratorAt(0, false);
 
-        short iMapCount = maplist->GetCount();
+        short iMapCount = maplist->count();
         for (short iMap = 0; iMap < iMapCount; iMap++) {
             std::string szThumbnail("maps/cache/");
             szThumbnail += GetNameFromFileName(itr->second->filename);

diff --git a/src/smw/main.cpp b/src/smw/main.cpp
@@ -176,7 +176,7 @@ void create_globals()
     maplist = new MapList(false);
 
     //TODO: add proper test via size
-    if (maplist->IsEmpty()) {
+    if (maplist->isEmpty()) {
         throw "Empty map directory!";
     }
 

diff --git a/src/smw/ui/MI_MapBrowser.cpp b/src/smw/ui/MI_MapBrowser.cpp
@@ -243,10 +243,10 @@ void MI_MapBrowser::Reset(short type)
         iFilterTagAnimationTimer = 0;
         iFilterTagAnimationFrame = 72;
 
-        iMapCount = maplist->GetCount();
+        iMapCount = maplist->count();
     } else {
         iSelectedIndex = maplist->GetCurrent()->second->iFilteredIndex;
-        iMapCount = maplist->GetFilteredCount();
+        iMapCount = maplist->filteredCount();
     }
 
     iSelectedRow = (iSelectedIndex / 3) % 3;