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

Merge pull request #3425 from Gymnasiast/load-sv4-from-dialog 

Enable SV4 files to be loaded from the native load/save dialog
This commit is contained in:
Ted John 2016-04-25 20:04:27 +01:00
parent 4149bcdd30 57d2618fb5
commit aa77c06c01
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/game.c
View File

@ -41,6 +41,7 @@
#include "peep/peep.h" #include "peep/peep.h"
#include "peep/staff.h" #include "peep/staff.h"
#include "platform/platform.h" #include "platform/platform.h"
#include "rct1.h"
#include "ride/ride.h" #include "ride/ride.h"
#include "ride/ride_ratings.h" #include "ride/ride_ratings.h"
#include "ride/vehicle.h" #include "ride/vehicle.h"
@ -933,7 +934,17 @@ bool game_load_save(const utf8 *path)
return false; return false;
} }
bool result = game_load_sv6(rw); uint32 extension_type = get_file_extension_type(path);
bool result = false;
if (extension_type == FILE_EXTENSION_SV6) {
result = game_load_sv6(rw);
} else if (extension_type == FILE_EXTENSION_SV4) {
result = rct1_load_saved_game(path);
if (result)
gFirstTimeSave = 1;
}
SDL_RWclose(rw); SDL_RWclose(rw);
if (result) { if (result) {
@ -946,7 +957,7 @@ bool game_load_save(const utf8 *path)
} }
return true; return true;
} else { } else {
// If loading the SV6 failed, the current park state will be corrupted // If loading the SV6 or SV4 failed, the current park state will be corrupted
// so just go back to the title screen. // so just go back to the title screen.
title_load(); title_load();
return false; return false;