Fixed wrong cast

This commit is contained in:
KiritoDv
2023-09-16 02:40:39 -06:00
parent 6315d3fdd4
commit 4fc05fce16
5 changed files with 14 additions and 8 deletions
+6
View File
@@ -234,6 +234,12 @@ struct CtlEntry {
struct Drum **drums;
}; // size = 0xC
struct AudioSequenceData {
u32 bankCount;
u8* banks;
u8* data;
};
struct M64ScriptState {
u8 *pc;
u8 *stack[4];
+3 -3
View File
@@ -398,7 +398,7 @@ out2:
#endif
}
struct AudioBankSample* load_sequence_immediate(s32 seqId, s32 arg1) {
uint8_t* load_sequence_immediate(s32 seqId, s32 arg1) {
return GameEngine_LoadSequence(seqId);
}
@@ -428,7 +428,7 @@ void preload_sequence(u32 seqId, u8 preloadMask) {
}
if (preloadMask & PRELOAD_SEQUENCE) {
struct AudioBankSample* sequenceData = load_sequence_immediate(seqId, 2);
uint8_t* sequenceData = load_sequence_immediate(seqId, 2);
if (sequenceData == NULL) {
gAudioLoadLock = AUDIO_LOCK_NOT_LOADING;
return;
@@ -467,7 +467,7 @@ void load_sequence_internal(u32 player, u32 seqId, s32 loadAsync) {
eu_stubbed_printf_2("Seq %d:Default Load Id is %d\n", seqId, seqPlayer->defaultBank[0]);
eu_stubbed_printf_0("Seq Loading Start\n");
struct AudioBankSample* sequenceData = load_sequence_immediate(seqId, 2);
uint8_t* sequenceData = load_sequence_immediate(seqId, 2);
if (sequenceData == NULL) {
return;
}
+3 -3
View File
@@ -21,7 +21,7 @@ GameEngine::GameEngine(){
this->context->GetWindow()->SetMaximumFrameLatency(1);
this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Anim, "Animation", std::make_shared<CubeOS::AnimationFactory>());
this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Bank, "Bank", std::make_shared<CubeOS::AudioBankFactory>());
this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Audio, "Audio", std::make_shared<CubeOS::AudioSampleFactory>());
this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Sample, "Sample", std::make_shared<CubeOS::AudioSampleFactory>());
}
void GameEngine::Create(){
@@ -85,7 +85,7 @@ extern "C" void GameEngine_UnloadBank(uint8_t bankId) {
}
}
extern "C" AudioBankSample* GameEngine_LoadSequence(uint8_t seqId) {
extern "C" uint8_t* GameEngine_LoadSequence(uint8_t seqId) {
auto engine = GameEngine::Instance;
if(seqId > (sizeof(gSequenceTable) / sizeof(gSequenceTable[0]))){
return nullptr;
@@ -93,7 +93,7 @@ extern "C" AudioBankSample* GameEngine_LoadSequence(uint8_t seqId) {
if(engine->samples.contains(seqId)){
return engine->samples[seqId];
}
auto sample = static_cast<AudioBankSample *>(ResourceGetDataByName(gSequenceTable[seqId]));
auto sample = static_cast<uint8_t *>(ResourceGetDataByName(gSequenceTable[seqId]));
engine->samples[seqId] = sample;
return sample;
}
+1 -1
View File
@@ -18,7 +18,7 @@ class GameEngine {
std::shared_ptr<LUS::Context> context;
std::unordered_map<uint8_t, CtlEntry*> banks;
std::unordered_map<uint8_t, AudioBankSample*> samples;
std::unordered_map<uint8_t, uint8_t*> samples;
GameEngine();
static void Create();