mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace SDLRW with fopen in interop.c

This commit is contained in:
Ted John 2017-03-30 18:29:22 +01:00
parent 80bdb25740
commit 4ba60cbf52
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/rct2/interop.c
View File

@ -14,6 +14,8 @@
*****************************************************************************/ *****************************************************************************/
#pragma endregion #pragma endregion
#include <stdio.h>
#include "../common.h" #include "../common.h"
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
@ -179,17 +181,20 @@ bool rct2_interop_setup_segment()
utf8 segmentDataPath[MAX_PATH]; utf8 segmentDataPath[MAX_PATH];
rct2_interop_get_segment_data_path(segmentDataPath, sizeof(segmentDataPath)); rct2_interop_get_segment_data_path(segmentDataPath, sizeof(segmentDataPath));
SDL_RWops * rw = SDL_RWFromFile(segmentDataPath, "rb");
if (rw == NULL) // Warning: for Windows this will fail if given a non-ASCII path,
// but given this code is temporary - its not worth resolving.
FILE * file = fopen(segmentDataPath, "rb");
if (file == NULL)
{ {
log_error("failed to load file"); log_error("failed to load file");
return false; return false;
} }
if (SDL_RWread(rw, segments, len, 1) != 1) { if (fread(segments, len, 1, file) != 1) {
log_error("Unable to read chunk header!"); log_error("Unable to read chunk header!");
return false; return false;
} }
SDL_RWclose(rw); fclose(file);
#endif // defined(USE_MMAP) && defined(__WINDOWS__) #endif // defined(USE_MMAP) && defined(__WINDOWS__)
#if !defined(NO_RCT2) && defined(USE_MMAP) #if !defined(NO_RCT2) && defined(USE_MMAP)