Skip to content

Commit 0cc038f

Browse files
committed
Merge pull request #973 from PlayEveryWare/integrate/1.16.4-nativecode
Integrate/1.16.4 nativecode
1 parent 8bb82b7 commit 0cc038f

40 files changed

+129
-85
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:90f48d15a2e71966a46aa0f97a90e65ae8e8f7c4d72cea4f9f4d12ac7aec3181
2+
oid sha256:4137246fe695d302dac3b9dae8f6c7fa84617bdef16d1973a7d4cd67b99502c4
33
size 10752
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6f7f4283120741c4169c06242095b40d41e3999f4996044e6520fb921fb64a37
3-
size 113152
2+
oid sha256:866feddfad909ac1600ef529504bb7c9313a754207bbd1c71a09cb76e4b7bbcb
3+
size 98816
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6203520194ff29270b680df366fbef2c4dae2227ed557b932bfd70c9acb03aa4
3-
size 132472
2+
oid sha256:9d80a1d8c03ce977e5c81b739921e0053161793d6e6c0aa7242890016fd32866
3+
size 83320
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c998e283bcfd333042699c39be7b4269d55cf50ffcb9ed046992cd65b2545c49
3-
size 212064
2+
oid sha256:5d5e275620ce7d8be8e6f317300aefa071e293a93d6f9515b30930e32b626a1c
3+
size 176928

lib/NativeCode/third_party/eos_sdk/include/eos_achievements_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#pragma pack(push, 8)
88

9-
EXTERN_C typedef struct EOS_AchievementsHandle* EOS_HAchievements;
9+
EOS_EXTERN_C typedef struct EOS_AchievementsHandle* EOS_HAchievements;
1010

1111
/** The most recent version of the EOS_Achievements_QueryDefinitions struct. */
1212
#define EOS_ACHIEVEMENTS_QUERYDEFINITIONS_API_LATEST 3

lib/NativeCode/third_party/eos_sdk/include/eos_anticheatclient_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma pack(push, 8)
99

10-
EXTERN_C typedef struct EOS_AntiCheatClientHandle* EOS_HAntiCheatClient;
10+
EOS_EXTERN_C typedef struct EOS_AntiCheatClientHandle* EOS_HAntiCheatClient;
1111

1212
/** Operating modes */
1313
EOS_ENUM(EOS_EAntiCheatClientMode,

lib/NativeCode/third_party/eos_sdk/include/eos_anticheatcommon_types.h

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Typically this is a pointer to an object describing the
1414
* player, but it can be anything that is locally unique.
1515
*/
16-
EXTERN_C typedef void* EOS_AntiCheatCommon_ClientHandle;
16+
EOS_EXTERN_C typedef void* EOS_AntiCheatCommon_ClientHandle;
1717

1818
/** Flags describing the type of a remote client */
1919
EOS_ENUM(EOS_EAntiCheatCommonClientType,
@@ -156,6 +156,18 @@ EOS_ENUM(EOS_EAntiCheatCommonEventParamType,
156156
EOS_ACCEPT_Float = 9
157157
);
158158

159+
/** Flags describing the type of competition taking place */
160+
EOS_ENUM(EOS_EAntiCheatCommonGameRoundCompetitionType,
161+
/** No particular competition type applies */
162+
EOS_ACCGRCT_None = 0,
163+
/** Casual unranked play */
164+
EOS_ACCGRCT_Casual = 1,
165+
/** Ranked play, usually with skill based matchmaking */
166+
EOS_ACCGRCT_Ranked = 2,
167+
/** Organized competitive play like a tournament */
168+
EOS_ACCGRCT_Competitive = 3
169+
);
170+
159171
/** Details of a player's movement state */
160172
EOS_ENUM(EOS_EAntiCheatCommonPlayerMovementState,
161173
/** No particular state applies */
@@ -204,10 +216,16 @@ EOS_ENUM(EOS_EAntiCheatCommonPlayerTakeDamageType,
204216
EOS_ENUM(EOS_EAntiCheatCommonPlayerTakeDamageResult,
205217
/** No direct state change consequence for the victim */
206218
EOS_ACCPTDR_None = 0,
207-
/** Player character is temporarily incapacitated and requires assistance to recover */
208-
EOS_ACCPTDR_Downed = 1,
209-
/** Player character is permanently incapacitated and cannot recover (e.g. dead) */
210-
EOS_ACCPTDR_Eliminated = 2
219+
/** Deprecated - use more specific values below instead */
220+
EOS_ACCPTDR_Downed_DEPRECATED = 1,
221+
/** Deprecated - use more specific values below instead */
222+
EOS_ACCPTDR_Eliminated_DEPRECATED = 2,
223+
/** Player character transitioned from a normal state to temporarily incapacitated and requires assistance to recover. */
224+
EOS_ACCPTDR_NormalToDowned = 3,
225+
/** Player character transitioned from a normal state to permanently incapacitated and cannot recover (e.g. dead). */
226+
EOS_ACCPTDR_NormalToEliminated = 4,
227+
/** Player character transitioned from a temporarily incapacitated state to permanently incapacitated and cannot recover (e.g. dead). */
228+
EOS_ACCPTDR_DownedToEliminated = 5
211229
);
212230

213231
/** Vector using left-handed coordinate system (as in Unreal Engine) */
@@ -346,7 +364,7 @@ EOS_STRUCT(EOS_AntiCheatCommon_LogEventOptions, (
346364
const EOS_AntiCheatCommon_LogEventParamPair* Params;
347365
));
348366

349-
#define EOS_ANTICHEATCOMMON_LOGGAMEROUNDSTART_API_LATEST 1
367+
#define EOS_ANTICHEATCOMMON_LOGGAMEROUNDSTART_API_LATEST 2
350368
EOS_STRUCT(EOS_AntiCheatCommon_LogGameRoundStartOptions, (
351369
/** API Version: Set this to EOS_ANTICHEATCOMMON_LOGGAMEROUNDSTART_API_LATEST. */
352370
int32_t ApiVersion;
@@ -358,6 +376,8 @@ EOS_STRUCT(EOS_AntiCheatCommon_LogGameRoundStartOptions, (
358376
const char* ModeName;
359377
/** Optional length of the game round to be played, in seconds. If none, use 0. */
360378
uint32_t RoundTimeSeconds;
379+
/** Type of competition for this game round */
380+
EOS_EAntiCheatCommonGameRoundCompetitionType CompetitionType;
361381
));
362382

363383
#define EOS_ANTICHEATCOMMON_LOGGAMEROUNDEND_API_LATEST 1

lib/NativeCode/third_party/eos_sdk/include/eos_anticheatserver_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma pack(push, 8)
99

10-
EXTERN_C typedef struct EOS_AntiCheatServerHandle* EOS_HAntiCheatServer;
10+
EOS_EXTERN_C typedef struct EOS_AntiCheatServerHandle* EOS_HAntiCheatServer;
1111

1212
/**
1313
* Maximum size of an individual message provided through EOS_AntiCheatServer_OnMessageToClientCallback.

lib/NativeCode/third_party/eos_sdk/include/eos_auth_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#pragma pack(push, 8)
88

9-
EXTERN_C typedef struct EOS_AuthHandle* EOS_HAuth;
9+
EOS_EXTERN_C typedef struct EOS_AuthHandle* EOS_HAuth;
1010

1111
/**
1212
* All possible types of login methods, availability depends on permissions granted to the client.

lib/NativeCode/third_party/eos_sdk/include/eos_base.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ typedef int32_t EOS_Bool;
105105
#endif
106106

107107
#ifdef __cplusplus
108-
#define EXTERN_C extern "C"
108+
#define EOS_EXTERN_C extern "C"
109109
#else
110-
#define EXTERN_C
110+
#define EOS_EXTERN_C
111111
#endif
112112

113-
#define EOS_DECLARE_FUNC(return_type) EXTERN_C EOS_API return_type EOS_CALL
114-
#define EOS_DECLARE_CALLBACK(CallbackName, ...) EXTERN_C typedef void (EOS_CALL * CallbackName)(__VA_ARGS__)
115-
#define EOS_DECLARE_CALLBACK_RETVALUE(ReturnType, CallbackName, ...) EXTERN_C typedef ReturnType (EOS_CALL * CallbackName)(__VA_ARGS__)
113+
#define EOS_DECLARE_FUNC(return_type) EOS_EXTERN_C EOS_API return_type EOS_CALL
114+
#define EOS_DECLARE_CALLBACK(CallbackName, ...) EOS_EXTERN_C typedef void (EOS_CALL * CallbackName)(__VA_ARGS__)
115+
#define EOS_DECLARE_CALLBACK_RETVALUE(ReturnType, CallbackName, ...) EOS_EXTERN_C typedef ReturnType (EOS_CALL * CallbackName)(__VA_ARGS__)
116116
#define EOS_PASTE(...) __VA_ARGS__
117117
#define EOS_STRUCT(struct_name, struct_def) \
118-
EXTERN_C typedef struct _tag ## struct_name { \
118+
EOS_EXTERN_C typedef struct _tag ## struct_name { \
119119
EOS_PASTE struct_def \
120120
} struct_name
121121

0 commit comments

Comments
 (0)