mirror of
https://github.com/HarbourMasters/Starship
synced 2026-07-29 15:45:14 -04:00
Fixed switch compilation and other weird quirks with deps
This commit is contained in:
committed by
Sonic Dreamcaster
parent
1940c26bce
commit
af9c94351e
+3
-3
@@ -154,11 +154,11 @@ extern "C" uint8_t GameEngine_OTRSigCheck(const char* data) {
|
||||
}
|
||||
|
||||
extern "C" float __cosf(float angle) {
|
||||
return std::cosf(angle);
|
||||
return cosf(angle);
|
||||
}
|
||||
|
||||
extern "C" float __sinf(float angle) {
|
||||
return std::sinf(angle);
|
||||
return sinf(angle);
|
||||
}
|
||||
|
||||
extern "C" float SIN_DEG(float angle) {
|
||||
@@ -183,7 +183,7 @@ uint64_t Timer_GetCurrentMillis() {
|
||||
return SDL_GetTicks();
|
||||
}
|
||||
|
||||
extern "C" int32_t Timer_CreateTask(uint64_t time, TimerAction action, int32_t* address, int32_t value) {
|
||||
extern "C" s32 Timer_CreateTask(u64 time, TimerAction action, s32* address, s32 value) {
|
||||
const auto millis = Timer_GetCurrentMillis();
|
||||
TimedEntry entry = {
|
||||
.duration = millis + CYCLES_TO_MSEC_PC(time),
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "MessageLookupFactory.h"
|
||||
#include "../type/Message.h"
|
||||
#include "spdlog/spdlog.h"
|
||||
|
||||
#include "resourcebridge.h"
|
||||
#include "ResourceUtil.h"
|
||||
|
||||
namespace SF64 {
|
||||
std::shared_ptr<LUS::IResource> ResourceFactoryBinaryMessageLookupV0::ReadResource(std::shared_ptr<LUS::File> file) {
|
||||
@@ -18,7 +18,7 @@ std::shared_ptr<LUS::IResource> ResourceFactoryBinaryMessageLookupV0::ReadResour
|
||||
SPDLOG_INFO("Reading message lookup table entry {}", i);
|
||||
auto id = reader->ReadInt32();
|
||||
|
||||
uint16_t* ptr = static_cast<uint16_t*>(ResourceGetDataByCrc(reader->ReadUInt64()));
|
||||
uint16_t* ptr = LoadChild<uint16_t*>(reader->ReadUInt64());
|
||||
table->mLookupTable.push_back({ id, ptr });
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user