From 6b8d5db100ea8e75a3634f2c3390eccfc52955a5 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 27 Nov 2018 21:32:12 +1100 Subject: [PATCH] fix missing extern --- src/Entity.c | 2 ++ src/Entity.h | 2 +- src/Platform.c | 3 +++ src/Platform.h | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Entity.c b/src/Entity.c index 6cd2e45a9..d0fe708bf 100644 --- a/src/Entity.c +++ b/src/Entity.c @@ -1045,6 +1045,8 @@ bool LocalPlayer_HandlesKey(Key key) { /*########################################################################################################################* *-------------------------------------------------------NetPlayer---------------------------------------------------------* *#########################################################################################################################*/ +struct NetPlayer NetPlayers_List[ENTITIES_SELF_ID]; + static void NetPlayer_SetLocation(struct Entity* e, struct LocationUpdate* update, bool interpolate) { struct NetPlayer* p = (struct NetPlayer*)e; NetInterpComp_SetLocation(&p->Interp, update, interpolate); diff --git a/src/Entity.h b/src/Entity.h index cb7b9631e..be0d70a50 100644 --- a/src/Entity.h +++ b/src/Entity.h @@ -142,7 +142,7 @@ struct NetPlayer { bool ShouldRender; }; void NetPlayer_Init(struct NetPlayer* player, const String* displayName, const String* skinName); -struct NetPlayer NetPlayers_List[ENTITIES_SELF_ID]; +extern struct NetPlayer NetPlayers_List[ENTITIES_SELF_ID]; /* Represents the user/player's own entity. */ struct LocalPlayer { diff --git a/src/Platform.c b/src/Platform.c index 80426308e..9ee206366 100644 --- a/src/Platform.c +++ b/src/Platform.c @@ -8,12 +8,15 @@ #include "AsyncDownloader.h" #include "Bitmap.h" +#define FT_EXPORT(x) extern x #include "freetype/ft2build.h" #include "freetype/freetype.h" #include "freetype/ftmodapi.h" static void Platform_InitDisplay(void); static void Platform_InitStopwatch(void); +struct DisplayDevice DisplayDevice_Default; +void* DisplayDevice_Meta; #ifdef CC_BUILD_WIN #define WIN32_LEAN_AND_MEAN diff --git a/src/Platform.h b/src/Platform.h index 6b16f099e..7c417b6c5 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -36,8 +36,8 @@ extern const ReturnCode ReturnCode_InvalidArg; /* Data for a display device. (usually a monitor) */ struct DisplayDevice { int BitsPerPixel; Rect2D Bounds; }; -struct DisplayDevice DisplayDevice_Default; -void* DisplayDevice_Meta; +extern struct DisplayDevice DisplayDevice_Default; +extern void* DisplayDevice_Meta; struct GraphicsMode { int R,G,B,A, BitsPerPixel, IsIndexed; /* Colour buffer data */