Merge pull request #17 from garrettjoecox/modsnew

Fix clang compiler issues

include/objects.h

@@ -4,6 +4,10 @@
 #include "spline.h"
 #include <common_structs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OBJECT_LIST_SIZE 0x226
 #define SOME_OBJECT_INDEX_LIST_SIZE 32
 
@@ -451,4 +455,8 @@ extern s8 D_8018D230;
 //! Some sort of limiter on how many of some object type can spawn
 extern s32 D_8018D3C4;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/actors/blue_and_red_shells/update.inc.c

@@ -4,6 +4,7 @@
 #include <main.h>
 #include <actors_extended.h>
 #include <code_800029B0.h>
+#include "port/Game.h"
 
 void func_802B3B44(struct ShellActor* shell) {
     u16 currentWaypoint;

src/actors/green_shell/update.inc.c

@@ -3,6 +3,7 @@
 #include <code_800029B0.h>
 #include <defines.h>
 #include "collision.h"
+#include "port/Game.h"
 
 /**
  * @brief Updates the green shell actor.

src/animation.c

@@ -7,6 +7,7 @@
 #include <main.h>
 #include <libultra/gbi.h>
 #include "code_80057C60.h"
+#include "engine/Matrix.h"
 
 Vec3s sOriginalPosAnimation;
 s16 isNotTheFirst;

src/code_800029B0.c

@@ -179,7 +179,7 @@ void setup_race(void) {
     struct Controller* controller;
     int i;
 
-    printf("Setup Race!\n");
+    LUSLOG_DEBUG("Setup Race!", 0);
 
     gPlayerCountSelection1 = gPlayerCount;
     if (gGamestate != RACING) {

src/code_80057C60.c

@@ -38,6 +38,7 @@
 #include "data/some_data.h"
 #include <assets/some_data.h>
 #include "port/Game.h"
+#include "engine/Matrix.h"
 
 //! @warning this macro is undef'd at the end of this file
 #define MAKE_RGB(r, g, b) (((r) << 0x10) | ((g) << 0x08) | (b << 0x00))

src/data/some_data.h

@@ -7,6 +7,10 @@
 #include <assets/other_textures.h>
 #include "objects.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern Vtx D_800E49C0[];
 extern Vtx D_800E4AC0[];
 extern Vtx D_800E4BC0[];
@@ -87,4 +91,8 @@ extern StarData gWarioStadiumStars[];
 extern u8 D_800E6F30[][3];
 extern u8 D_800E6F48[][3];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/ending/code_80280000.c

@@ -28,6 +28,7 @@
 #include "engine/Engine.h"
 #include "engine/courses/Course.h"
 #include "engine/Matrix.h"
+#include "port/Game.h"
 
 s32 D_802874A0;
 // s32 D_802874A4[5];

src/engine/Matrix.h

@@ -19,6 +19,8 @@ Mtx* GetEffectMatrix(void);
 void ClearHudMatrixPool(void);
 void ClearEffectsMatrixPool(void);
 void ClearObjectsMatrixPool(void);
+void AddKartMatrix(Mat4 mtx, s32 flags);
+void AddShadowMatrix(Mat4 mtx, s32 flags);
 
 #ifdef __cplusplus
 }

src/main.c

@@ -46,6 +46,7 @@
 #include "enhancements/freecam/freecam.h"
 #include "engine/wasm.h"
 #include "port/Game.h"
+#include "engine/Matrix.h"
 
 // Declarations (not in this file)
 void func_80091B78(void);

src/math_util_2.c

@@ -14,6 +14,7 @@
 #include "camera.h"
 
 #include "port/Engine.h"
+#include "engine/Matrix.h"
 
 #pragma intrinsic(sqrtf)
 

src/player_controller.c

@@ -22,6 +22,7 @@
 #include "sounds.h"
 #include "port/Game.h"
 #include "src/enhancements/moon_jump.h"
+#include "engine/Matrix.h"
 
 extern s32 D_8018D168;
 

src/port/Game.h

@@ -82,6 +82,36 @@ void CourseManager_BombKartsWaypoint(s32 cameraId);
 
 void CourseManager_ScrollingTextures();
 
+s32 CourseManager_GetCrossingOnTriggered(uintptr_t* crossing);
+
+void CourseManager_VehiclesSpawn();
+
+void CourseManager_DrawWater(struct UnkStruct_800DC5EC* screen, uint16_t pathCounter, uint16_t cameraRot, uint16_t playerDirection);
+
+void CourseManager_AICrossingBehaviour(s32 playerId);
+
+void CourseManager_ClearVehicles(void);
+
+void CourseManager_DrawVehicles(s32 playerId);
+
+void CourseManager_CrossingTrigger();
+
+void CourseManager_VehiclesCollision(s32 playerId, Player* player);
+
+void CourseManager_VehiclesTick();
+
+void CourseManager_TickBombKarts();
+
+void CourseManager_TickActors();
+
+void CourseManager_TrainSmokeTick(void);
+
+void CourseManager_DrawBattleBombKarts(s32 cameraId);
+
+void CourseManager_DrawBombKarts(s32 cameraId);
+
+void CourseManager_TrainSmokeDraw(s32 cameraId);
+
 size_t GetCupCursorPosition();
 
 void SetCupCursorPosition(size_t position);
@@ -92,12 +122,17 @@ void SetCourseFromCup();
 
 void* GetCourse(void);
 
+void SetCourseById(s32 course);
+
 void SetCourseByClass(void* course);
 
 struct Actor* m_GetActor(size_t index);
 void m_DeleteActor(size_t index);
 struct Actor* m_AddBaseActor(void);
 size_t m_GetActorSize();
+size_t m_FindActorIndex(struct Actor* actor);
+void m_ActorCollision(Player* player, struct Actor* actor);
+void m_ClearActors(void);
 
 void* GetMarioRaceway(void);
 
@@ -151,6 +186,8 @@ void* GetSpecialCup(void);
 
 void* GetBattleCup(void);
 
+void* GetCup();
+
 #ifdef __cplusplus
 }
 #endif

src/racing/actors.c

@@ -850,7 +850,7 @@ void spawn_piranha_plants(struct ActorSpawnData* spawnData) {
     }
 }
 
-void spawn_palm_trees(const char* spawnData) {
+void spawn_palm_trees(struct ActorSpawnData* spawnData) {
     struct ActorSpawnData* temp_s0 = spawnData;
     struct PalmTree* temp_v1;
     Vec3f startingPos;

src/racing/actors_extended.c

@@ -15,6 +15,7 @@
 #include "update_objects.h"
 #include "effects.h"
 #include "sounds.h"
+#include "port/Game.h"
 
 void copy_collision(Collision* src, Collision* dest) {
     dest->unk30 = src->unk30;

src/racing/math_util.c

@@ -7,6 +7,7 @@
 #include "buffers/trig_tables.h"
 #include "math.h"
 #include "memory.h"
+#include "engine/Matrix.h"
 
 #pragma intrinsic(sqrtf, fabs)
 

src/racing/render_courses.h

@@ -36,6 +36,7 @@ void render_double_deck(struct UnkStruct_800DC5EC*);
 void render_dks_jungle_parkway(struct UnkStruct_800DC5EC*);
 void render_big_donut(struct UnkStruct_800DC5EC*);
 void func_8029569C(void);
+void course_init(void);
 void render_course(struct UnkStruct_800DC5EC*);
 void func_80295BF8(s32);
 void func_80295C6C(void);

src/render_player.c

@@ -31,6 +31,7 @@
 #include <assets/wario_kart.h>
 #include <assets/donkeykong_kart.h>
 #include "port/Game.h"
+#include "engine/Matrix.h"
 
 s8 gRenderingFramebufferByPlayer[] = { 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02 };