iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	src/frontend/main.cpp
This commit is contained in:
SimoneN64
2024-08-18 01:08:40 +02:00
parent a4e6227af2 acdb6b2210
commit fa487d9969
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/core/mmio/PIF/MupenMovie.cpp
View File

@@ -35,7 +35,7 @@ bool MupenMovie::Load(const fs::path &path) {
return false; return false;
} }
memcpy(&loadedTasMovieHeader, loadedTasMovie.data(), loadedTasMovie.size()); memcpy(&loadedTasMovieHeader, loadedTasMovie.data(), sizeof(TASMovieHeader));
if (loadedTasMovieHeader.signature[0] != 0x4D || loadedTasMovieHeader.signature[1] != 0x36 || loadedTasMovieHeader.signature[2] != 0x34 || loadedTasMovieHeader.signature[3] != 0x1A) { if (loadedTasMovieHeader.signature[0] != 0x4D || loadedTasMovieHeader.signature[1] != 0x36 || loadedTasMovieHeader.signature[2] != 0x34 || loadedTasMovieHeader.signature[3] != 0x1A) {
Util::error("Failed to load movie: incorrect signature. Are you sure this is a valid movie?"); Util::error("Failed to load movie: incorrect signature. Are you sure this is a valid movie?");

2
src/backend/core/mmio/PIF/MupenMovie.hpp
View File

@@ -52,8 +52,6 @@ struct MupenMovie {
n64::Controller NextInputs(); n64::Controller NextInputs();
bool IsLoaded() const { return !loadedTasMovie.empty(); } bool IsLoaded() const { return !loadedTasMovie.empty(); }
private: private:
std::string filename = "";
std::string game = "";
std::vector<u8> loadedTasMovie = {}; std::vector<u8> loadedTasMovie = {};
TASMovieHeader loadedTasMovieHeader = {}; TASMovieHeader loadedTasMovieHeader = {};
uint32_t loadedTasMovieIndex = 0; uint32_t loadedTasMovieIndex = 0;

4
src/utils/log.hpp
View File

@@ -9,13 +9,13 @@
namespace Util { namespace Util {
enum LogLevel : u8 { enum LogLevel : u8 {
Trace, Debug, Info, Warn, Error, Always Trace, Debug, Warn, Info, Error, Always
}; };
#ifndef NDEBUG #ifndef NDEBUG
static constexpr auto globalLogLevel = Debug; static constexpr auto globalLogLevel = Debug;
#else #else
static constexpr auto globalLogLevel = Error; static constexpr auto globalLogLevel = Info;
#endif #endif
template <LogLevel messageType = Info, typename ...Args> template <LogLevel messageType = Info, typename ...Args>