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

Remove gScenarioExpansionPacks

This commit is contained in:
Gymnasiast 2020-08-28 22:50:53 +02:00 committed by Ted John
parent d6fc9d4459
commit 509bc3fe90
4 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/rct2/S6Exporter.cpp
View File

@ -352,7 +352,6 @@ void S6Exporter::Export()
_s6.park_entrance_direction[i] = entrance.direction; _s6.park_entrance_direction[i] = entrance.direction;
} }
safe_strcpy(_s6.scenario_filename, gScenarioFileName, sizeof(_s6.scenario_filename)); safe_strcpy(_s6.scenario_filename, gScenarioFileName, sizeof(_s6.scenario_filename));
std::memcpy(_s6.saved_expansion_pack_names, gScenarioExpansionPacks, sizeof(_s6.saved_expansion_pack_names));
ExportBanners(); ExportBanners();
_s6.game_ticks_1 = gCurrentTicks; _s6.game_ticks_1 = gCurrentTicks;

1
src/openrct2/rct2/S6Importer.cpp
View File

@ -385,7 +385,6 @@ public:
// For savegames the filename can be arbitrary, so we have no choice but to rely on the name provided // For savegames the filename can be arbitrary, so we have no choice but to rely on the name provided
String::Set(gScenarioFileName, sizeof(gScenarioFileName), _s6.scenario_filename); String::Set(gScenarioFileName, sizeof(gScenarioFileName), _s6.scenario_filename);
} }
std::memcpy(gScenarioExpansionPacks, _s6.saved_expansion_pack_names, sizeof(_s6.saved_expansion_pack_names));
gCurrentTicks = _s6.game_ticks_1; gCurrentTicks = _s6.game_ticks_1;
gCurrentRealTimeTicks = 0; gCurrentRealTimeTicks = 0;

1
src/openrct2/scenario/Scenario.cpp
View File

@ -63,7 +63,6 @@ std::string gScenarioName;
std::string gScenarioDetails; std::string gScenarioDetails;
std::string gScenarioCompletedBy; std::string gScenarioCompletedBy;
std::string gScenarioSavePath; std::string gScenarioSavePath;
char gScenarioExpansionPacks[3256];
bool gFirstTimeSaving = true; bool gFirstTimeSaving = true;
uint16_t gSavedAge; uint16_t gSavedAge;
uint32_t gLastAutoSaveUpdate = 0; uint32_t gLastAutoSaveUpdate = 0;

1
src/openrct2/scenario/Scenario.h
View File

@ -441,7 +441,6 @@ extern std::string gScenarioName;
extern std::string gScenarioDetails; extern std::string gScenarioDetails;
extern std::string gScenarioCompletedBy; extern std::string gScenarioCompletedBy;
extern std::string gScenarioSavePath; extern std::string gScenarioSavePath;
extern char gScenarioExpansionPacks[3256];
extern bool gFirstTimeSaving; extern bool gFirstTimeSaving;
extern uint16_t gSavedAge; extern uint16_t gSavedAge;
extern uint32_t gLastAutoSaveUpdate; extern uint32_t gLastAutoSaveUpdate;