Skip to content

Check asset integrity in main loop to catch lazy-loaded assets #8594

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

Open
StephenCWills wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −0
Open

Check asset integrity in main loop to catch lazy-loaded assets #8594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Source/diablo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#endif
#endif

#include <fmt/format.h>

Check warning on line 22 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:22:1 [misc-include-cleaner] 

included header format.h is not used directly

#include <config.h>

Expand All @@ -42,7 +42,7 @@
#include "diablo_msg.hpp"
#include "discord/discord.h"
#include "doom.h"
#include "encrypt.h"

Check warning on line 45 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:45:1 [misc-include-cleaner] 

included header encrypt.h is not used directly
#include "engine/backbuffer_state.hpp"
#include "engine/clx_sprite.hpp"
#include "engine/demomode.h"
Expand All @@ -61,10 +61,10 @@
#include "hwcursor.hpp"
#include "init.hpp"
#include "inv.h"
#include "levels/drlg_l1.h"

Check warning on line 64 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:64:1 [misc-include-cleaner] 

included header drlg_l1.h is not used directly
#include "levels/drlg_l2.h"

Check warning on line 65 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:65:1 [misc-include-cleaner] 

included header drlg_l2.h is not used directly
#include "levels/drlg_l3.h"

Check warning on line 66 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:66:1 [misc-include-cleaner] 

included header drlg_l3.h is not used directly
#include "levels/drlg_l4.h"

Check warning on line 67 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:67:1 [misc-include-cleaner] 

included header drlg_l4.h is not used directly
#include "levels/gendung.h"
#include "levels/setmaps.h"
#include "levels/themes.h"
Expand Down Expand Up @@ -113,10 +113,10 @@
#include "utils/paths.h"
#include "utils/screen_reader.hpp"
#include "utils/sdl_compat.h"
#include "utils/sdl_thread.h"

Check warning on line 116 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:116:1 [misc-include-cleaner] 

included header sdl_thread.h is not used directly
#include "utils/status_macros.hpp"
#include "utils/str_cat.hpp"
#include "utils/utf8.hpp"

Check warning on line 119 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:119:1 [misc-include-cleaner] 

included header utf8.hpp is not used directly

#ifndef USE_SDL1
#include "controls/touch/gamepad.h"
Expand All @@ -134,8 +134,8 @@
namespace devilution {

uint32_t DungeonSeeds[NUMLEVELS];
std::optional<uint32_t> LevelSeeds[NUMLEVELS];

Check warning on line 137 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:137:6 [misc-include-cleaner] 

no header providing "std::optional" is directly included
Point MousePosition;

Check warning on line 138 in Source/diablo.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/diablo.cpp:138:1 [misc-include-cleaner] 

no header providing "devilution::Point" is directly included
bool gbRunGameResult;
bool ReturnToMainMenu;
/** Enable updating of player character, set to false once Diablo dies */
Expand Down Expand Up @@ -902,6 +902,10 @@
}
DebugCmdsFromCommandLine.clear();
}
#else
if (gbIsMultiplayer && IsAssetIntegrityViolated) {
app_fatal(_("Cannot play Multiplayer with overridden *.lua, *.tsv, or *.sol assets."));
}
#endif

SDL_Event event;
Expand Down
Loading