thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 11:12:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(sound): Small script related improvements

Browse source 
* chore(build): rename src/util/Log.* to SysMessage.*

* chore(ui): implement SetNonSpaceWrap() for error messages

* chore(ui): move Video Script methods into CGVideoOptions class

* chore(script): temporary fix GetNumOutputDrivers to eliminate loading errors

* feat(sound): add SI2 Log methods

* chore(sound): add SI2 CVars

* chore(ui): implement Script_PlayGlueMusic

* chore(sound): update SI2::Init()

* fix: resolve compilation errors in variadic macros SI2_ERR and SI2_LOG

---------

Co-authored-by: Tristan Cormier <cormiert2@outlook.com>
This commit is contained in:
VDm 2024-03-06 00:53:07 +04:00 • committed by GitHub
parent 8596860120
commit 32cfe08d0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 366 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/sound/SI2.cpp
View file

@ -1,11 +1,73 @@
#include "sound/SI2.hpp"
#include "ui/FrameScript.hpp"
#include "console/CVar.hpp"
#include <storm/Memory.hpp>
FMOD::System* SI2::sm_pGameSystem = nullptr;
FMOD::System* SI2::sm_pChatSystem = nullptr;
void* F_CALL FMOD_Alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char* sourcestr) {
return SMemAlloc(size, sourcestr, 0, 0);
}
void* F_CALL FMOD_ReAlloc(void* ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char* sourcestr) {
return SMemReAlloc(ptr, size, sourcestr, 0, 0);
}
void F_CALL FMOD_Free(void* ptr, FMOD_MEMORY_TYPE type, const char* sourcestr) {
SMemFree(ptr, sourcestr, 0, 0);
}
void SI2::RegisterScriptFunctions() {
for (int32_t i = 0; i < NUM_SCRIPT_FUNCTIONS_SI2; ++i) {
FrameScript_RegisterFunction(
SI2::s_ScriptFunctions[i].name,
SI2::s_ScriptFunctions[i].method
);
FrameScript_Method* item = s_ScriptFunctions;
while (item->name) {
FrameScript_RegisterFunction(item->name, item->method);
item++;
}
}
int32_t SI2::Init(int32_t flag) {
Log_Init();
SI2_LOG("=> Version %s (%s) %s", "1.0.0", "00000", "Feb 25 2024");
SI2_LOG(" ");
SI2_LOG("=> Setting up Game Sound:");
SI2_LOG(" - SESound Engine Init");
SI2_LOG(" - FMOD Memory Init");
FMOD::Memory_Initialize(nullptr, 0, &FMOD_Alloc, &FMOD_ReAlloc, &FMOD_Free);
// sub_877440(&off_B1D5E4);
SI2_LOG(" - FMOD System Create");
auto errcode = FMOD::System_Create(&sm_pGameSystem);
if (errcode) {
if (errcode != FMOD_ERR_DSP_SILENCE && errcode != FMOD_ERR_INVALID_VECTOR && errcode != FMOD_ERR_RECORD) {
SI2_ERR(errcode, "");
}
SI2_LOG(" -###########################################################################################");
SI2_ERR(errcode, " -######## ERROR INITIALIZING. ALL GAME SOUND DISABLED.");
SI2_LOG(" -###########################################################################################");
sm_pGameSystem->setOutput(FMOD_OUTPUTTYPE_NOSOUND);
goto LABEL_9;
}
errcode = FMOD::System_Create(&sm_pChatSystem);
if (errcode != FMOD_ERR_DSP_SILENCE && errcode != FMOD_ERR_INVALID_VECTOR && errcode != FMOD_ERR_RECORD) {
SI2_ERR(errcode, "");
}
if (sm_pChatSystem && sm_pChatSystem->init(4, FMOD_INIT_NORMAL, nullptr)) {
sm_pChatSystem->setOutput(FMOD_OUTPUTTYPE_NOSOUND);
}
sm_pGameSystem->setOutput(FMOD_OUTPUTTYPE_AUTODETECT);
LABEL_9:
return 0;
}
void SI2::StartGlueMusic(const char* filename) {
}