ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13226 from JosJuice/achievementmanager-forward-declarations 

AchievementManager: Add required forward declarations
This commit is contained in:
Jordan Woyak 2024-12-15 14:02:56 -06:00 committed by GitHub
parent ada646a795 ad24ddb6bb
commit b4a1967310
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/AchievementManager.h
View File

@ -275,11 +275,21 @@ private:
#include <string> #include <string>
namespace ActionReplay
{
struct ARCode;
}
namespace DiscIO namespace DiscIO
{ {
class Volume; class Volume;
} }
namespace Gecko
{
class GeckoCode;
}
class AchievementManager class AchievementManager
{ {
public: public:

4
Source/Core/DolphinTool/VerifyCommand.cpp
View File

@ -133,8 +133,10 @@ int VerifyCommand(const std::vector<std::string>& args)
hashes_to_calculate.md5 = true; hashes_to_calculate.md5 = true;
else if (algorithm == "sha1") else if (algorithm == "sha1")
hashes_to_calculate.sha1 = true; hashes_to_calculate.sha1 = true;
#ifdef USE_RETRO_ACHIEVEMENTS
else if (algorithm == "rchash") else if (algorithm == "rchash")
rc_hash_calculate = true; rc_hash_calculate = true;
#endif
} }
if (!hashes_to_calculate.crc32 && !hashes_to_calculate.md5 && !hashes_to_calculate.sha1 && if (!hashes_to_calculate.crc32 && !hashes_to_calculate.md5 && !hashes_to_calculate.sha1 &&
@ -163,11 +165,13 @@ int VerifyCommand(const std::vector<std::string>& args)
verifier.Finish(); verifier.Finish();
const DiscIO::VolumeVerifier::Result& result = verifier.GetResult(); const DiscIO::VolumeVerifier::Result& result = verifier.GetResult();
#ifdef USE_RETRO_ACHIEVEMENTS
// Calculate rcheevos hash // Calculate rcheevos hash
if (rc_hash_calculate) if (rc_hash_calculate)
{ {
rc_hash_result = AchievementManager::CalculateHash(input_file_path); rc_hash_result = AchievementManager::CalculateHash(input_file_path);
} }
#endif
// Print the report // Print the report
if (!algorithm_is_set) if (!algorithm_is_set)