Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 02:24:01 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix clang compilation errors (#964)

Browse Source 
It still complains on 🍎 due to the missing SDL header. Doing `brew
install SDL2` does not fix the issue. I think it would eventually be
beneficial to add a macOS agent to the CI.
This commit is contained in:
Luciano Ciccariello 2024-01-11 09:23:41 +00:00 committed by GitHub
parent 558a79d2eb
commit 12357071c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common.h
View File

@ -41,7 +41,9 @@
#define ALIGNED4
#endif
#ifndef __clang__
int sprintf(char* dst, const char* fmt, ...);
#endif
#define FIX(x) ((s32)((x)*65536.0))
#define FIX_TO_I(x) ((s32)((x) >> 16))

2
src/pc/pc.c
View File

@ -15,6 +15,8 @@ void OpenCd(char* filename) {
}
}
int CdReading();
void ExecCd();
void MyAudioCallback(void* data, u8* buffer, int length) {
int i = 0;
while (i * 4 < length) {

2
src/pc/sim_pc.c
View File

@ -57,7 +57,6 @@ void VSyncHandler(void) {
D_800A04F4++;
D_800A04F8 = (D_800A04F4 / 4) % 32;
nullsub_10();
if (D_800A04F0) {
return;
}
@ -130,6 +129,7 @@ void LoadStageTileset(u8* pTilesetData, s32 y) {
}
void InitStageDummy(Overlay* o);
void func_80131EBC(const char* str, s16 arg1);
s32 LoadFileSimToMem(SimKind kind) {
char pad[0x20];
s32 i;

5
src/pc/stubs.c
View File

@ -150,7 +150,7 @@ s32 D_80097424;
s32 D_80097448[2];
s32 D_80097450;
Pos D_80097488;
u32 mocked_800C52F8[0x200] = {0};
PixPattern* mocked_800C52F8[0x200] = {NULL};
PixPattern* D_800C52F8[] = {
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
@ -280,7 +280,7 @@ s32 D_8013984C;
s32 D_80139850;
s32 D_80139854;
u16 D_80137538[32];
GfxBank g_FakeGfxBank = {0};
GfxBank* g_FakeGfxBank = {NULL};
GfxBank** g_GfxSharedBank[] = {
&g_FakeGfxBank, &g_FakeGfxBank, &g_FakeGfxBank, &g_FakeGfxBank,
&g_FakeGfxBank, &g_FakeGfxBank, &g_FakeGfxBank, &g_FakeGfxBank,
@ -348,7 +348,6 @@ ImgSrc g_imgUnk8013C200_impl = {
0,
0,
0,
NULL,
};
ImgSrc* g_imgUnk8013C200 = &g_imgUnk8013C200_impl;
ImgSrc* g_imgUnk8013C270 = &g_imgUnk8013C200_impl;