diff options
| author | Aki <please@ignore.pl> | 2022-04-10 15:24:32 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2022-04-10 15:25:02 +0200 |
| commit | 034aa81895b201164004d79aa090e882e3e66945 (patch) | |
| tree | 502ad20a5488c3258c866514e9a286e89321f8f4 /StarsEx/DataLoader.h | |
| parent | e8c40a99cb00ea7f68dcb1b8414065785c89df9c (diff) | |
| download | starshatter-034aa81895b201164004d79aa090e882e3e66945.zip starshatter-034aa81895b201164004d79aa090e882e3e66945.tar.gz starshatter-034aa81895b201164004d79aa090e882e3e66945.tar.bz2 | |
Moved archives list from static part of impl to loader member
Including Archive.h in DataLoader.h created name conflicts and created
an error due to missing types from Types.h in the Archive.h itself.
Diffstat (limited to 'StarsEx/DataLoader.h')
| -rw-r--r-- | StarsEx/DataLoader.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/StarsEx/DataLoader.h b/StarsEx/DataLoader.h index 0331dcb..eaf4f28 100644 --- a/StarsEx/DataLoader.h +++ b/StarsEx/DataLoader.h @@ -10,6 +10,7 @@ #ifndef DataLoader_h #define DataLoader_h +#include "Archive.h" #include "Types.h" #include "List.h" #include "Text.h" @@ -30,6 +31,7 @@ public: enum { DATAFILE_OK, DATAFILE_INVALID, DATAFILE_NOTEXIST }; DataLoader(); + virtual ~DataLoader(); static DataLoader* GetLoader() { return loader; } static void Initialize(); @@ -76,6 +78,7 @@ private: bool use_file_system; bool enable_media; + List<DataArchive> archives; static DataLoader* loader; }; |