From 464545b907dfe5c711ab44e61beeb534a8dc85fa Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 28 Sep 2020 17:02:59 +0300 Subject: [PATCH] Cleanup remnants Co-authored-by: Gabriel Guedes --- src/openrct2-ui/title/TitleSequencePlayer.cpp | 4 ---- src/openrct2-ui/windows/TitleEditor.cpp | 5 ----- src/openrct2/title/TitleSequence.cpp | 4 ---- src/openrct2/title/TitleSequence.h | 1 - src/openrct2/title/TitleSequenceManager.cpp | 1 - 5 files changed, 15 deletions(-) diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index 3ddddc02a1..d161657040 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -73,10 +73,6 @@ public: void Eject() override { - if (_sequence == nullptr) - return; - - FreeTitleSequence(*_sequence); _sequence = nullptr; } diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index a9be679e2c..f06c4fafb9 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -255,7 +255,6 @@ static void window_title_editor_close(rct_window* w) // Close the related windows window_close_by_class(WC_TITLE_COMMAND_EDITOR); - FreeTitleSequence(*_editingTitleSequence); _editingTitleSequence = nullptr; _sequenceName = nullptr; @@ -1062,10 +1061,6 @@ static void window_title_editor_load_sequence(size_t index) size_t predefinedIndex = title_sequence_manager_get_predefined_index(index); _isSequenceReadOnly = (predefinedIndex != SIZE_MAX); _sequenceName = title_sequence_manager_get_name(index); - if (_editingTitleSequence != nullptr) - { - FreeTitleSequence(*_editingTitleSequence); - } _editingTitleSequence = std::move(titleSequence); window_close_by_class(WC_TITLE_COMMAND_EDITOR); diff --git a/src/openrct2/title/TitleSequence.cpp b/src/openrct2/title/TitleSequence.cpp index 8c6a698d8a..210e2a2006 100644 --- a/src/openrct2/title/TitleSequence.cpp +++ b/src/openrct2/title/TitleSequence.cpp @@ -100,10 +100,6 @@ std::unique_ptr LoadTitleSequence(const utf8* path) return seq; } -void FreeTitleSequence(TitleSequence& seq) -{ -} - TitleSequenceParkHandle* TitleSequenceGetParkHandle(TitleSequence& seq, size_t index) { TitleSequenceParkHandle* handle = nullptr; diff --git a/src/openrct2/title/TitleSequence.h b/src/openrct2/title/TitleSequence.h index 362ed062b1..5bf96b6703 100644 --- a/src/openrct2/title/TitleSequence.h +++ b/src/openrct2/title/TitleSequence.h @@ -79,7 +79,6 @@ constexpr uint8_t SAVE_INDEX_INVALID = UINT8_MAX; std::unique_ptr CreateTitleSequence(); std::unique_ptr LoadTitleSequence(const utf8* path); -void FreeTitleSequence(TitleSequence& seq); TitleSequenceParkHandle* TitleSequenceGetParkHandle(TitleSequence& seq, size_t index); diff --git a/src/openrct2/title/TitleSequenceManager.cpp b/src/openrct2/title/TitleSequenceManager.cpp index 48d3f81e11..c7817394e4 100644 --- a/src/openrct2/title/TitleSequenceManager.cpp +++ b/src/openrct2/title/TitleSequenceManager.cpp @@ -144,7 +144,6 @@ namespace TitleSequenceManager seq->IsZip = true; bool success = TitleSequenceSave(*seq); - FreeTitleSequence(*seq); size_t index = SIZE_MAX; if (success)