zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[mod] Correctly find .mmo files.

Browse source
This commit is contained in:
lzwdgc 2024-02-16 01:25:12 +03:00
parent abce8c17e1
commit d51dff3a32
1 changed files with 31 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/aim1_mod_maker/aim1_mod_maker.h
View file

@ -538,52 +538,44 @@ FF D7 ; call edi
return p; return p;
} }
case file_type::mmo: { case file_type::mmo: {
auto p = get_data_dir() / "maps2.pak"; auto p = find_file_in_paks(fn, "res3.pak", "maps2.pak", "maps.pak");
if (fs::exists(p) && (false if (!fs::exists(p)) {
// it contains only these throw SW_RUNTIME_ERROR("Cannot find file in archives: "s + fn.string());
|| fn == "location3.mmo"
|| fn == "location4.mmo"
|| fn == "location5.mmo"
)) {
unpak(p, fn);
p = make_unpak_dir(p);
if (!fs::exists(p / fn)) {
p = p / fn.filename();
} else {
p /= fn;
} }
if (fs::exists(p)) {
auto dst = get_mod_dir() / p.filename(); auto dst = get_mod_dir() / p.filename();
if (!fs::exists(dst)) { if (!fs::exists(dst)) {
fs::copy_file(p, dst); fs::copy_file(p, dst);
} }
return dst; return dst;
} }
}
p = get_data_dir() / "maps.pak";
unpak(p
// takes too long to extract specific files
// maybe speedup the unpaker
//, fn
);
p = make_unpak_dir(p);
if (!fs::exists(p / fn)) {
p = p / fn.filename();
} else {
p /= fn;
}
if (!fs::exists(p)) {
throw SW_RUNTIME_ERROR("Cannot find file in archives: "s + fn.string());
}
auto dst = get_mod_dir() / p.filename();
if (!fs::exists(dst)) {
fs::copy_file(p, dst);
}
return dst;
}
default: default:
SW_UNIMPLEMENTED; SW_UNIMPLEMENTED;
}
}
path find_file_in_paks(path fn, auto &&... paks) const {
auto find_file = [&](const path &pak) {
auto p = get_data_dir() / pak;
if (!fs::exists(p)) {
return false;
}
auto up = make_unpak_dir(p);
if (!fs::exists(up)) {
unpak(p);
}
p = up;
if (!fs::exists(p / fn)) {
p = p / fn.filename();
if (!fs::exists(p)) {
return false;
} }
} else {
p /= fn;
}
fn = p;
return true;
};
(find_file(paks) || ...);
return fn;
} }
// from https://github.com/Solant/aim-patches // from https://github.com/Solant/aim-patches
void free_camera(uint8_t val) { void free_camera(uint8_t val) {
@ -647,6 +639,9 @@ FF D7 ; call edi
return p; return p;
} }
void unpak(const path &p, const path &fn = {}) const { void unpak(const path &p, const path &fn = {}) const {
unpak1(p,{});
}
void unpak1(const path &p, const path &fn = {}) const {
auto udir = make_unpak_dir(p); auto udir = make_unpak_dir(p);
if (fs::exists(udir) && (fn.empty() || fs::exists(udir / fn))) { if (fs::exists(udir) && (fn.empty() || fs::exists(udir / fn))) {
return; return;