File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change 25
25
26
26
#include " MusicMan.h"
27
27
28
+ #include " mz.h"
28
29
#include " zip.h"
29
30
#include " unzip.h"
30
31
31
32
#include " SDL3/SDL_surface.h"
32
33
#include < SDL3_image/SDL_image.h>
33
34
35
+ #include < execution>
36
+
34
37
using namespace RTE ;
35
38
36
39
ActivityMan::ActivityMan () {
@@ -253,7 +256,8 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
253
256
char * buffer = nullptr ;
254
257
255
258
auto unzipFileIntoBuffer = [&](std::string fullFileName) {
256
- if (unzLocateFile (zippedSaveFile, fullFileName.c_str (), nullptr ) == UNZ_END_OF_LIST_OF_FILE) {
259
+ // These need to use NULL instead of nullptr to compile on Linux/OSX?
260
+ if (unzLocateFile (zippedSaveFile, fullFileName.c_str (), NULL ) == UNZ_END_OF_LIST_OF_FILE) {
257
261
return false ;
258
262
}
259
263
Original file line number Diff line number Diff line change @@ -105,7 +105,8 @@ void SaveLoadMenuGUI::PopulateSaveGamesList() {
105
105
return ;
106
106
}
107
107
108
- if (unzLocateFile (zippedSaveFile, " Index.ini" , nullptr ) == UNZ_END_OF_LIST_OF_FILE) {
108
+ // These need to use NULL instead of nullptr to compile on Linux/OSX?
109
+ if (unzLocateFile (zippedSaveFile, " Index.ini" , NULL ) == UNZ_END_OF_LIST_OF_FILE) {
109
110
unzClose (zippedSaveFile);
110
111
return ;
111
112
}
You can’t perform that action at this time.
0 commit comments