incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pvr codepath in quest loading

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-13 14:10:58 -08:00
parent 201676be5c
commit cbe69c6ada
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Main.cc
+1 -1
View File
@@ -1375,7 +1375,7 @@ int main(int argc, char** argv) {
shared_ptr<string> dat_data(new string(load_file(dat_filename))); shared_ptr<string> dat_data(new string(load_file(dat_filename)));
shared_ptr<string> pvr_data; shared_ptr<string> pvr_data;
try { try {
shared_ptr<string> dat_data(new string(load_file(pvr_filename))); pvr_data.reset(new string(load_file(pvr_filename)));
} catch (const cannot_open_file&) { } catch (const cannot_open_file&) {
} }
shared_ptr<VersionedQuest> vq(new VersionedQuest(0, 0, cli_quest_version, 0, bin_data, dat_data, pvr_data)); shared_ptr<VersionedQuest> vq(new VersionedQuest(0, 0, cli_quest_version, 0, bin_data, dat_data, pvr_data));
src/Quest.cc
-2
View File
@@ -498,8 +498,6 @@ QuestIndex::QuestIndex(
add_file(dat_files, file_basename, prs_compress_optimal(file_data)); add_file(dat_files, file_basename, prs_compress_optimal(file_data));
} else if (extension == "pvr") { } else if (extension == "pvr") {
add_file(pvr_files, file_basename, std::move(file_data)); 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") { } else if (extension == "qst") {
auto files = decode_qst_data(file_data); auto files = decode_qst_data(file_data);
for (auto& it : files) { for (auto& it : files) {