mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-05-23 06:54:37 -04:00
fix build on OpenBSD (#621)
* fix build on OpenBSD * Update src/port/Game.cpp * Update ceremony_and_credits.c
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
+1
-1
@@ -70,7 +70,7 @@ HarbourMastersIntro gMenuIntro;
|
||||
|
||||
TrackEditor::Editor gEditor;
|
||||
|
||||
s32 gTrophyIndex = NULL;
|
||||
s32 gTrophyIndex = NULL_OBJECT_ID;
|
||||
|
||||
/** Spawner Registries **/
|
||||
Registry<TrackInfo> gTrackRegistry;
|
||||
|
||||
@@ -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__)
|
||||
|
||||
Reference in New Issue
Block a user