diff options
| author | Fabien Romano <fabienromano@gmail.com> | 2026-01-01 21:06:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-01 13:06:40 -0700 |
| commit | a4c01b784b8e65f416a007b06caa8eb8a4c3dd12 (patch) | |
| tree | e66a537a9d41df41c001fcb6e80ab1a618b7e3f8 /src | |
| parent | dfd6516db06fd6fc9bce8fe8ea73bf1f6a26d17c (diff) | |
fix build on OpenBSD (#621)
* fix build on OpenBSD
* Update src/port/Game.cpp
* Update ceremony_and_credits.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/ending/ceremony_and_credits.c | 2 | ||||
| -rw-r--r-- | src/port/Game.cpp | 2 | ||||
| -rw-r--r-- | src/port/Game.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/ending/ceremony_and_credits.c b/src/ending/ceremony_and_credits.c index 4af1c5ac7..fef0f95c4 100644 --- a/src/ending/ceremony_and_credits.c +++ b/src/ending/ceremony_and_credits.c @@ -998,7 +998,7 @@ void func_80284154(CinematicCamera* camera) { void func_80284184(CinematicCamera* camera) { f32 trophy; - if (gTrophyIndex != NULL) { + if (gTrophyIndex != NULL_OBJECT_ID) { trophy = ((gObjectList[gTrophyIndex].pos[1] - camera->lookAt[1]) * 0.9f) + camera->lookAt[1]; f32_lerp(&camera->pos[1], trophy, 0.5); } diff --git a/src/port/Game.cpp b/src/port/Game.cpp index dd4c4b6a5..ee958daba 100644 --- a/src/port/Game.cpp +++ b/src/port/Game.cpp @@ -70,7 +70,7 @@ HarbourMastersIntro gMenuIntro; TrackEditor::Editor gEditor; -s32 gTrophyIndex = NULL; +s32 gTrophyIndex = NULL_OBJECT_ID; /** Spawner Registries **/ Registry<TrackInfo> gTrackRegistry; diff --git a/src/port/Game.h b/src/port/Game.h index 743aecb75..a457be7ad 100644 --- a/src/port/Game.h +++ b/src/port/Game.h @@ -239,6 +239,7 @@ __attribute__((format(printf, 1, 2))) #if defined(_MSC_VER) __declspec(noreturn) #elif defined(__APPLE__) +#elif defined(__OpenBSD__) #elif defined(__cplusplus) || (__STDC_VERSION__ >= 202311) [[noreturn]] #elif defined(__GNUC__) |