mirror of
https://github.com/open-goal/jak-project
synced 2026-09-10 20:29:51 -04:00
random fixes + support clang-cl on visual studio (#1129)
* delete unused shaders * hide some options in debug menu * change fullscreen logic a bit * add "all actors" toggle * borderless fix and fix alpha in direct renderer untextured (do we need a separate shader for that?) * fix fuel cell orbit icons in widescreen * fix `curve` types * refs * fix levitator task... * fix some task stuff * update font code a bit (temp) * cmake, third-party and visual studio overhaul * Update .gitmodules * update modules * clone repos * fix encoding in zydis * where did these come from * try again * add submodule * Update 11zip * Update 11zip * Update 11zip * delete * try again * clang * update compiler flags * delete 11zip. go away. * Create memory-dump-p2s.py * properly * fix minimum architecture c++ compiler flags * fix zydis * oops * Update all-types.gc * fix clang-cl tests * make "all actors" work better, entity debug qol * update game-text conversion code to be more modularized * Create vendor.txt * fix typos and minor things * update refs * clang * Attempt to add clang-cl support to vs2019 and CI * vs2022 + clang-cl * srsly? fix clang build * Update launch.vs.json * extend windows CI timer
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <optional>
|
||||
#include "third-party/fmt/core.h"
|
||||
#include "third-party/11zip/include/elzip/elzip.hpp"
|
||||
#include "third-party/json.hpp"
|
||||
|
||||
#include "common/util/FileUtil.h"
|
||||
@@ -13,6 +13,8 @@
|
||||
#include "decompiler/util/DecompilerTypeSystem.h"
|
||||
#include "common/util/assert.h"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
struct Ram {
|
||||
const u8* data = nullptr;
|
||||
u32 size = 0;
|
||||
@@ -569,18 +571,9 @@ int main(int argc, char** argv) {
|
||||
output_folder = argv[2];
|
||||
}
|
||||
|
||||
// If it's a PCSX2 savestate, lets extract the ee memory automatically
|
||||
if (ends_with(file_name, "p2s")) {
|
||||
fmt::print("Detected PCSX2 Save-state '{}', extracting memory...\n", file_name);
|
||||
elz::extractZip(file_name, "./savestate-out");
|
||||
// Then, check for and use the eeMemory.bin file
|
||||
if (fs::exists("./savestate-out/eeMemory.bin")) {
|
||||
file_name = "./savestate-out/eeMemory.bin";
|
||||
fmt::print("EE Memory extracted\n");
|
||||
} else {
|
||||
fmt::print("Couldn't locate EE Memory, aborting!\n");
|
||||
return 1;
|
||||
}
|
||||
fmt::print("PS2 savestates are not directly supported. Please extract contents beforehand.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
fmt::print("Loading memory from '{}'\n", file_name);
|
||||
|
||||
Reference in New Issue
Block a user