Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revise FailedToOpenFileError #7305

Merged
merged 4 commits into from
Sep 17, 2024
Merged

Revise FailedToOpenFileError #7305

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0198584
Revise FailedToOpenFileError
kphoenix137 Jul 28, 2024
54c7b8b
Update assets.hpp
kphoenix137 Jul 28, 2024
754f02d
Update assets.hpp
kphoenix137 Aug 24, 2024
66c5728
Update assets.hpp
kphoenix137 Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Source/engine/assets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
#include <SDL.h>
#include <expected.hpp>

#include <fmt/format.h>

#include "appfat.h"
#include "diablo.h"
#include "mpq/mpq_reader.hpp"
#include "utils/file_util.h"
#include "utils/language.h"
#include "utils/str_cat.hpp"
#include "utils/string_or_view.hpp"

Expand Down Expand Up @@ -220,7 +223,7 @@ struct AssetHandle {

[[noreturn]] inline void FailedToOpenFileError(std::string_view path, std::string_view error)
{
app_fatal(StrCat("Failed to open file:\n", path, "\n\n", error));
app_fatal(fmt::format(fmt::runtime(_("Failed to open file:\n{:s}\n\n{:s}\n\nThe MPQ file(s) might be damaged. Please check the file integrity.")), path, error));
}

inline bool ValidatAssetRef(std::string_view path, const AssetRef &ref)
Expand Down
Loading