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 2525
2626#include " MusicMan.h"
2727
28+ #include " mz.h"
2829#include " zip.h"
2930#include " unzip.h"
3031
3132#include " SDL3/SDL_surface.h"
3233#include < SDL3_image/SDL_image.h>
3334
35+ #include < execution>
36+
3437using namespace RTE ;
3538
3639ActivityMan::ActivityMan () {
@@ -253,7 +256,8 @@ bool ActivityMan::LoadAndLaunchGame(const std::string& fileName) {
253256 char * buffer = nullptr ;
254257
255258 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) {
257261 return false ;
258262 }
259263
Original file line number Diff line number Diff line change @@ -105,7 +105,8 @@ void SaveLoadMenuGUI::PopulateSaveGamesList() {
105105 return ;
106106 }
107107
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) {
109110 unzClose (zippedSaveFile);
110111 return ;
111112 }
You can’t perform that action at this time.
0 commit comments