From 46241c9aa0258c635392e7f52fed9619057201d9 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 23 Jan 2024 20:51:36 -0500 Subject: [PATCH] Expose Some Properties --- mods/include/mods/server/server.h | 5 +++++ mods/include/mods/sound/sound.h | 6 ++++++ mods/src/server/server.cpp | 4 ++-- mods/src/sound/repository.cpp | 11 +++++------ 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 mods/include/mods/server/server.h create mode 100644 mods/include/mods/sound/sound.h diff --git a/mods/include/mods/server/server.h b/mods/include/mods/server/server.h new file mode 100644 index 0000000..a13b93b --- /dev/null +++ b/mods/include/mods/server/server.h @@ -0,0 +1,5 @@ +#pragma once + +#include "server_properties.h" + +ServerProperties &get_server_properties(); diff --git a/mods/include/mods/sound/sound.h b/mods/include/mods/sound/sound.h new file mode 100644 index 0000000..69f2fa0 --- /dev/null +++ b/mods/include/mods/sound/sound.h @@ -0,0 +1,6 @@ +#pragma once + +#include +#include + +extern std::unordered_map> sound_repository; diff --git a/mods/src/server/server.cpp b/mods/src/server/server.cpp index f07b6a3..31917cc 100644 --- a/mods/src/server/server.cpp +++ b/mods/src/server/server.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -44,7 +44,7 @@ __attribute__((constructor)) static void _init_only_generate(int argc, char *arg } // Server Properties -static ServerProperties &get_server_properties() { +ServerProperties &get_server_properties() { static ServerProperties properties; return properties; } diff --git a/mods/src/sound/repository.cpp b/mods/src/sound/repository.cpp index ee271d8..d9d521f 100644 --- a/mods/src/sound/repository.cpp +++ b/mods/src/sound/repository.cpp @@ -1,5 +1,3 @@ -#include -#include #include #include #include @@ -8,9 +6,10 @@ #include #include "sound-internal.h" +#include // Sound Repository Extracted From MCPE 0.6.1 APK -static std::unordered_map> repository = { +std::unordered_map> sound_repository = { { { "step.cloth", @@ -355,9 +354,9 @@ __attribute__((constructor)) static void init_rand_seed() { } // Pick Sound std::string _sound_pick(std::string sound) { - if (repository.count(sound) > 0) { + if (sound_repository.count(sound) > 0) { // Sound Exists - std::vector &options = repository[sound]; + std::vector &options = sound_repository[sound]; return options[rand() % options.size()]; } else { // Invalid Sound @@ -370,7 +369,7 @@ std::string _sound_pick(std::string sound) { void _sound_resolve_all() { std::string source = _sound_get_source_file(); if (source.size() > 0) { - for (auto &it : repository) { + for (auto &it : sound_repository) { for (std::string &name : it.second) { // Zero Volume Prevents An OpenAL Source From Being Allocated While Still Resolving The Sound media_audio_play(source.c_str(), name.c_str(), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f);