Some header cleanup in the file list code

mmatyas · Jun 2, 2024 · 5d5b20d · 5d5b20d
1 parent e54ee72
commit 5d5b20d
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 23 deletions.
diff --git a/src/common/FileList.cpp b/src/common/FileList.cpp
@@ -3,6 +3,8 @@
 #include "dirlist.h"
 #include "GlobalConstants.h"
 #include "linfunc.h"
+#include "path.h"
+#include "RandomNumberGenerator.h"
 
 #include <algorithm>
 #include <fstream>
@@ -16,8 +18,6 @@ extern WorldMusicList* worldmusiclist;
 
 namespace {
 const short g_iDefaultMusicCategory[MAXMUSICCATEGORY] {0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0};
-}// namespace
-
 
 struct MapMusicOverride {
     std::string mapname;
@@ -31,6 +31,8 @@ struct WorldMusicOverride {
 
 std::vector<MapMusicOverride> mapmusicoverrides;
 std::vector<WorldMusicOverride> worldmusicoverrides;
+} // namespace
+
 
 void UpdateMusicWithOverrides()
 {
@@ -217,6 +219,36 @@ bool SimpleFileList::find(const std::string& name)
     return fFound;
 }
 
+
+AnnouncerList::AnnouncerList()
+    : SimpleFileList(convertPath("sfx/announcer/"), ".txt")
+{}
+
+GraphicsList::GraphicsList()
+    : SimpleDirectoryList(convertPath("gfx/packs/"))
+{}
+
+SoundsList::SoundsList()
+    : SimpleDirectoryList(convertPath("sfx/packs/"))
+{}
+
+TourList::TourList()
+    : SimpleFileList(convertPath("tours/"), ".txt")
+{}
+
+WorldList::WorldList()
+    : SimpleFileList(convertPath("worlds/"), ".txt", true)
+{}
+
+BackgroundList::BackgroundList()
+    : SimpleFileList(convertPath("gfx/packs/Classic/backgrounds/"), ".png")
+{}
+
+FiltersList::FiltersList()
+    : SimpleFileList(convertPath("filters/"), ".txt")
+{}
+
+
 ///////////// SkinList ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 SkinList::SkinList()
 {

diff --git a/src/common/FileList.h b/src/common/FileList.h
@@ -1,8 +1,4 @@
-#ifndef FILELIST_H
-#define FILELIST_H
-
-#include "path.h"
-#include "RandomNumberGenerator.h"
+#pragma once
 
 #include <array>
 #include <map>
@@ -14,6 +10,11 @@
 #define MAXWORLDMUSICCATEGORY   9
 #define MAXCATEGORYTRACKS       64
 
+
+// Adds music overrides to the music lists
+void UpdateMusicWithOverrides();
+
+
 //it was kinda a bad idea to have skinlist and announcer list based on this, because both are accessed in different ways (skinlist like an vector and announcer list like a list). grrrr
 class SimpleFileList {
 public:
@@ -51,37 +52,37 @@ class SimpleDirectoryList : public SimpleFileList {
 
 class AnnouncerList : public SimpleFileList {
 public:
-    AnnouncerList(): SimpleFileList(convertPath("sfx/announcer/"), ".txt") {}
+    AnnouncerList();
 };
 
 class GraphicsList : public SimpleDirectoryList {
 public:
-    GraphicsList(): SimpleDirectoryList(convertPath("gfx/packs/")) {}
+    GraphicsList();
 };
 
 class SoundsList : public SimpleDirectoryList {
 public:
-    SoundsList(): SimpleDirectoryList(convertPath("sfx/packs/")) {}
+    SoundsList();
 };
 
 class TourList : public SimpleFileList {
 public:
-    TourList() : SimpleFileList(convertPath("tours/"), ".txt") {}
+    TourList();
 };
 
 class WorldList : public SimpleFileList {
 public:
-    WorldList() : SimpleFileList(convertPath("worlds/"), ".txt", true) {}
+    WorldList();
 };
 
 class BackgroundList : public SimpleFileList {
 public:
-    BackgroundList() : SimpleFileList(convertPath("gfx/packs/Classic/backgrounds/"), ".png") {}
+    BackgroundList();
 };
 
 class FiltersList : public SimpleFileList {
 public:
-    FiltersList() : SimpleFileList(convertPath("filters/"), ".txt") {}
+    FiltersList();
 };
 
 
@@ -221,5 +222,3 @@ class WorldMusicList {
     std::vector<std::unique_ptr<WorldMusicEntry>> m_entries;
     size_t m_currentIndex = 0;
 };
-
-#endif // FILELIST_H
diff --git a/src/common/GameValues.cpp b/src/common/GameValues.cpp
@@ -5,6 +5,7 @@
 #include "GameMode.h"
 #include "GlobalConstants.h"
 #include "MapList.h" // req. only by WriteConfig
+#include "path.h"
 #include "Version.h"
 #include "sfx.h"
 

diff --git a/src/common/MapList.cpp b/src/common/MapList.cpp
@@ -5,6 +5,8 @@
 #include "GameValues.h"
 #include "linfunc.h"
 #include "map.h"
+#include "path.h"
+#include "RandomNumberGenerator.h"
 #include "Version.h"
 
 #include <cstdlib>

diff --git a/src/common/ResourceManager.cpp b/src/common/ResourceManager.cpp
@@ -4,6 +4,7 @@
 #include "Game.h"
 #include "GameValues.h"
 #include "TilesetManager.h"
+#include "path.h"
 #include "gfx/Color.h"
 
 extern SkinList *skinlist;

diff --git a/src/common/TilesetManager.cpp b/src/common/TilesetManager.cpp
@@ -1,7 +1,7 @@
 #include "TilesetManager.h"
 
 #include "FileIO.h"
-#include "map.h"
+#include "path.h"
 
 #include <algorithm>
 #include <cassert>

diff --git a/src/common/global.cpp b/src/common/global.cpp
@@ -3,6 +3,7 @@
 #include "gfx.h"
 #include "map.h"
 #include "MapList.h"
+#include "path.h"
 #include "ResourceManager.h"
 #include "TilesetManager.h"
 

diff --git a/src/common/map.cpp b/src/common/map.cpp
@@ -7,6 +7,7 @@
 #include "FileIO.h"
 #include "map/MapReader.h"
 #include "movingplatform.h"
+#include "path.h"
 #include "RandomNumberGenerator.h"
 #include "ResourceManager.h"
 #include "TilesetManager.h"

diff --git a/src/smw/GSMenu.cpp b/src/smw/GSMenu.cpp
@@ -7,6 +7,8 @@
 #include "net.h"
 #include "map.h"
 #include "MapList.h"
+#include "path.h"
+#include "RandomNumberGenerator.h"
 #include "ResourceManager.h"
 #include "Score.h"
 #include "gamemodes/BonusHouse.h"

diff --git a/src/smw/GSSplashScreen.cpp b/src/smw/GSSplashScreen.cpp
@@ -7,6 +7,7 @@
 #include "GSMenu.h"
 #include "GSGameplay.h"
 #include "eyecandy.h"
+#include "path.h"
 #include "ResourceManager.h"
 
 extern SDL_Surface* screen;

diff --git a/src/smw/main.cpp b/src/smw/main.cpp
@@ -21,7 +21,7 @@
 #include "map.h"
 #include "MapList.h"
 #include "net.h"
-#include "linfunc.h"
+#include "path.h"
 #include "player.h"
 #include "ResourceManager.h"
 #include "sfx.h"
@@ -104,9 +104,6 @@ CGM_Boxes_MiniGame	*boxesgamemode = NULL;
 
 short currentgamemode = 0;
 
-//Adds music overrides to the music lists
-extern void UpdateMusicWithOverrides();
-
 extern SDL_Joystick     **joysticks;
 extern short            joystickcount;
 

diff --git a/src/smw/ui/MI_AnnouncerField.cpp b/src/smw/ui/MI_AnnouncerField.cpp
@@ -2,6 +2,7 @@
 
 #include "FileList.h"
 #include "input.h"
+#include "path.h"
 #include "ResourceManager.h"
 #include "ui/MI_Image.h"
 

diff --git a/src/smw/ui/MI_NetRoomTeamSelect.cpp b/src/smw/ui/MI_NetRoomTeamSelect.cpp
@@ -1,8 +1,9 @@
 #include "MI_NetRoomTeamSelect.h"
 
+#include "FileList.h"
 #include "GameValues.h"
+#include "RandomNumberGenerator.h"
 #include "ResourceManager.h"
-#include "FileList.h"
 #include "ui/MI_Image.h"
 
 extern CGameValues game_values;

diff --git a/src/smw/ui/MI_TeamSelect.cpp b/src/smw/ui/MI_TeamSelect.cpp
@@ -3,6 +3,7 @@
 #include "gfx.h"
 #include "Game.h"
 #include "GameValues.h"
+#include "RandomNumberGenerator.h"
 #include "ResourceManager.h"
 #include "FileList.h"
 #include "ui/MI_Image.h"

diff --git a/src/smw/ui/MI_World.cpp b/src/smw/ui/MI_World.cpp
@@ -4,6 +4,7 @@
 #include "FileList.h"
 #include "Game.h"
 #include "GameValues.h"
+#include "RandomNumberGenerator.h"
 #include "ResourceManager.h"
 #include "uimenu.h"
 #include "world.h"

diff --git a/src/smw/world.cpp b/src/smw/world.cpp
@@ -1,8 +1,10 @@
 #include "world.h"
 
+#include "FileList.h"
 #include "GameValues.h"
+#include "path.h"
+#include "RandomNumberGenerator.h"
 #include "ResourceManager.h"
-#include "FileList.h"
 #include "Version.h"
 #include "WorldTourStop.h"
 

diff --git a/src/worldeditor/worldeditor.cpp b/src/worldeditor/worldeditor.cpp
@@ -25,6 +25,7 @@
 #include "MapList.h"
 #include "menu/ModeOptionsMenu.h"
 #include "ObjectContainer.h"
+#include "path.h"
 #include "player.h"
 #include "ResourceManager.h"
 #include "sfx.h"