use main zlib

This commit is contained in:
gymnast86
2026-05-13 02:47:40 -07:00
parent 9c1617d423
commit 7db5386885
4 changed files with 7 additions and 12 deletions
@@ -12,7 +12,7 @@
#include "dusk/randomizer/generator/utility/text.hpp"
#include "SDL3/SDL_filesystem.h"
#include <zlib-ng.h>
#include <zlib.h>
#include <fstream>
@@ -831,7 +831,7 @@ u32 getActorPatchesCurrentStageKey(u8 roomNo) {
}
u32 getStageObjCRC32(u8* data, size_t size) {
return zng_crc32(0, (data), size);
return crc32(0, (data), size);
}
stage_tgsc_data_class parseObjData(const YAML::Node& objectNode) {
@@ -1,11 +1,12 @@
#include "config.hpp"
#include "zlib-ng.h"
#include "seed.hpp"
#include "../utility/log.hpp"
#include "../utility/platform.hpp"
#include "../utility/random.hpp"
#include "../utility/yaml.hpp"
#include <zlib.h>
#include <iostream>
@@ -459,7 +460,7 @@ namespace randomizer::seedgen::config
hashStr += "Spoiler Log: True";
}
const size_t integerSeed = zng_crc32(0L, reinterpret_cast<const uint8_t*>(hashStr.data()), hashStr.length());
const size_t integerSeed = crc32(0L, reinterpret_cast<const uint8_t*>(hashStr.data()), hashStr.length());
utility::random::RandomInit(integerSeed);
return 0;
+1 -7
View File
@@ -43,14 +43,8 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/matheusgomes28/base64pp.git
GIT_TAG v0.2.0-rc0
)
message(STATUS "randomizer: Fetching zlib-ng")
FetchContent_Declare(
zlib-ng
GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git
GIT_TAG 2.3.3
)
FetchContent_MakeAvailable(yaml-cpp base64pp zlib-ng)
FetchContent_MakeAvailable(yaml-cpp zlib base64pp)
string(LENGTH "${CMAKE_SOURCE_DIR}/" SOURCE_PATH_SIZE)
set(GAME_COMPILE_DEFS ${GAME_COMPILE_DEFS} SOURCE_PATH_SIZE=${SOURCE_PATH_SIZE})
+1 -1
View File
@@ -119,9 +119,9 @@ UserSettings g_userSettings = {
// Tools
.speedrunMode {"game.speedrunMode", false},
.liveSplitEnabled {"game.liveSplitEnabled", false},
.randomizerEnabled = {"game.randomizerEnabled", false}
.showSpeedrunRTATimer {"game.showSpeedrunRTATimer", true},
.recordingMode {"game.recordingMode", false},
.randomizerEnabled {"game.randomizerEnabled", false},
.showInputViewer {"game.showInputViewer", false},
.showInputViewerGyro {"game.showInputViewerGyro", false}
},