diff --git a/include/arc/math/point.h b/include/arc/math/point.h index b5b33b2..addf55d 100644 --- a/include/arc/math/point.h +++ b/include/arc/math/point.h @@ -3,16 +3,27 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct ARC_Point { - int32_t x, y; + int32_t x; + int32_t y; } ARC_Point; typedef struct ARC_UPoint { - uint32_t x, y; + uint32_t x; + uint32_t y; } ARC_UPoint; typedef struct ARC_FPoint { - float x, y; + float x; + float y; } ARC_FPoint; +#ifdef __cplusplus +} +#endif + #endif // ARC_MATH_POINT_H_ diff --git a/include/arc/math/rectangle.h b/include/arc/math/rectangle.h index b132609..d2d1bcb 100644 --- a/include/arc/math/rectangle.h +++ b/include/arc/math/rectangle.h @@ -3,6 +3,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct ARC_Rect { int32_t x; int32_t y; @@ -21,4 +25,8 @@ int32_t ARC_Rect_Intersects(ARC_Rect *rect1, ARC_Rect *rect2); int32_t ARC_Rect_LineIntersects(ARC_Rect *rect, int32_t *x1, int32_t *y1, int32_t *x2, int32_t *y2); +#ifdef __cplusplus +} +#endif + #endif // ARC_MATH_POINT_H_ diff --git a/include/arc/math/vector2.h b/include/arc/math/vector2.h index c68c085..11893bf 100644 --- a/include/arc/math/vector2.h +++ b/include/arc/math/vector2.h @@ -1,6 +1,10 @@ #ifndef ARC_MATH_VECTOR2_H_ #define ARC_MATH_VECTOR2_H_ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct ARC_Vector2 { float x, y; } ARC_Vector2; @@ -9,4 +13,10 @@ typedef struct ARC_DVector2 { double x, y; } ARC_DVector2; +void ARC_Vector2_Normalize(ARC_Vector2 *vector); + +#ifdef __cplusplus +} +#endif + #endif // ARC_MATH_VECTOR2_H_ diff --git a/include/arc/std/array.h b/include/arc/std/array.h index 733c8e3..dc802aa 100644 --- a/include/arc/std/array.h +++ b/include/arc/std/array.h @@ -3,6 +3,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief a type that holds an array of data and its size */ @@ -11,4 +15,8 @@ typedef struct ARC_Array { void *data; } ARC_Array; +#ifdef __cplusplus +} +#endif + #endif //ARC_STD_ARRAY_H_ \ No newline at end of file diff --git a/src/engine/state.c b/src/engine/state.c index 7f84745..5d3f707 100644 --- a/src/engine/state.c +++ b/src/engine/state.c @@ -2,7 +2,6 @@ #include void ARC_State_Update(void *data){ - ARC_State *temp = (ARC_State *)data; ((ARC_State *)data)->updateFn(((ARC_State *)data)->data); } diff --git a/src/files/config.c b/src/files/config.c index 033f5a9..1eb151b 100644 --- a/src/files/config.c +++ b/src/files/config.c @@ -43,7 +43,6 @@ uint8_t ARC_CSV_Read(ARC_Config *config, ARC_String *string, void **value){ uint32_t index = 0; for(uint32_t y = 0; y < height; y++){ uint32_t width = 0; - uint32_t data = 0; uint32_t x = 0; for(uint32_t i = index; i < fileData->length; i++){ diff --git a/src/graphics/sdl/sprite.c b/src/graphics/sdl/sprite.c index c50f92a..142c97b 100644 --- a/src/graphics/sdl/sprite.c +++ b/src/graphics/sdl/sprite.c @@ -28,7 +28,6 @@ void ARC_Sprite_Copy(ARC_Sprite **newSprite, ARC_Sprite *oldSprite){ } void ARC_Sprite_Render(ARC_Sprite *sprite, ARC_Renderer *renderer, ARC_Rect *renderBounds){ - ARC_Rect *temp = (ARC_Rect *)sprite->frames->data + *sprite->frameIndex; SDL_RenderCopy(renderer->renderer, sprite->spritesheet->texture, (SDL_Rect *)sprite->frames->data + *sprite->frameIndex, (SDL_Rect *)renderBounds); }