From cbe69c6adaefa2b44dbda60009f773bc3ee1d06f Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Mon, 13 Nov 2023 14:10:58 -0800 Subject: [PATCH] fix pvr codepath in quest loading --- src/Main.cc | 2 +- src/Quest.cc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Main.cc b/src/Main.cc index 5aa2ec30..d5e9fb70 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -1375,7 +1375,7 @@ int main(int argc, char** argv) { shared_ptr dat_data(new string(load_file(dat_filename))); shared_ptr pvr_data; try { - shared_ptr dat_data(new string(load_file(pvr_filename))); + pvr_data.reset(new string(load_file(pvr_filename))); } catch (const cannot_open_file&) { } shared_ptr vq(new VersionedQuest(0, 0, cli_quest_version, 0, bin_data, dat_data, pvr_data)); diff --git a/src/Quest.cc b/src/Quest.cc index f7f52fd9..11f0e77d 100644 --- a/src/Quest.cc +++ b/src/Quest.cc @@ -498,8 +498,6 @@ QuestIndex::QuestIndex( add_file(dat_files, file_basename, prs_compress_optimal(file_data)); } else if (extension == "pvr") { add_file(pvr_files, file_basename, std::move(file_data)); - } else if (extension == "pvrd") { - add_file(pvr_files, file_basename, prs_compress_optimal(file_data)); } else if (extension == "qst") { auto files = decode_qst_data(file_data); for (auto& it : files) {