From 5603e11d49e13a231ac87b498e050af1dd266fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 12 Sep 2016 18:27:21 +0200 Subject: [PATCH] Remove unused 0x13CA742 --- src/rct2/S6Exporter.cpp | 2 +- src/rct2/S6Importer.cpp | 2 +- src/scenario.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp index dbbf7be8a4..4c9104de14 100644 --- a/src/rct2/S6Exporter.cpp +++ b/src/rct2/S6Exporter.cpp @@ -408,7 +408,7 @@ void S6Exporter::Export() _s6.byte_13CA740 = gUnk13CA740; _s6.climate = gClimate; // pad_13CA741; - memcpy(_s6.byte_13CA742, RCT2_ADDRESS(0x013CA742, uint8), sizeof(_s6.byte_13CA742)); + // byte_13CA742 // pad_013CA747 _s6.climate_update_timer = gClimateUpdateTimer; _s6.current_weather = gClimateCurrentWeather; diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp index b43646549c..3e2ebc1a66 100644 --- a/src/rct2/S6Importer.cpp +++ b/src/rct2/S6Importer.cpp @@ -326,7 +326,7 @@ void S6Importer::Import() gUnk13CA740 = _s6.byte_13CA740; gClimate = _s6.climate; // pad_13CA741; - memcpy(RCT2_ADDRESS(0x013CA742, uint8), _s6.byte_13CA742, sizeof(_s6.byte_13CA742)); + // byte_13CA742 // pad_013CA747 gClimateUpdateTimer = _s6.climate_update_timer; gClimateCurrentWeather = _s6.current_weather; diff --git a/src/scenario.h b/src/scenario.h index fbea0f8a82..5237740186 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -307,7 +307,7 @@ typedef struct rct_s6_data { uint8 pad_13CA73F; uint8 byte_13CA740; uint8 pad_13CA741; - uint8 byte_13CA742[4]; + uint8 byte_13CA742[4]; // unused uint8 climate; uint8 pad_013CA747; uint16 climate_update_timer;