FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FWGS/hlsdk-xash3d into sdk-update

This commit is contained in:
Night Owl 2017-07-20 23:37:20 +05:00
parent d1fbb99574 8bae5a5450
commit bacf65d55b
7 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/Android.mk
View File

@ -91,7 +91,7 @@ SRCS+=./input_xash3d.cpp
SRCS+=./scoreboard.cpp
SRCS+=./MOTD.cpp
INCLUDES = -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls
DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w
DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w
LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
$(LOCAL_PATH)/../common \

4
cl_dll/cl_dll.h
View File

@ -41,6 +41,10 @@ typedef int ( *pfnUserMsgHook )( const char *pszName, int iSize, void *pbuf );
#include "exportdef.h"
#include <string.h>
#if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
#define XASH_64BIT
#endif
extern cl_enginefunc_t gEngfuncs;
#include "../engine/mobility_int.h"
extern mobile_engfuncs_t *gMobileEngfuncs;

2
cl_dll/com_weapons.h
View File

@ -1,4 +1,4 @@
//========= Copyright © 1996-2002, Valve LLC, All rights reserved. ============
//========= Copyright (c) 1996-2002, Valve LLC, All rights reserved. ============
//
// Purpose:
//

4
dlls/extdll.h
View File

@ -63,6 +63,10 @@ typedef int BOOL;
#include "stdlib.h"
#include "math.h"
#if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
#define XASH_64BIT
#endif
// Header file containing definition of globalvars_t and entvars_t
typedef unsigned int func_t;
typedef unsigned int string_t; // from engine's pr_comp.h;

4
dlls/nodes.h
View File

@ -104,8 +104,8 @@ typedef struct
//=========================================================
// CGraph
//=========================================================
#if defined(__amd64__) || defined(__aarch64__)
#define GRAPH_VERSION (int)17// Was incremented for 64bit arches, because .nod-files have incombatibilities on different arches.
#ifdef XASH_64BIT
#define GRAPH_VERSION (int)16 * 10
#else
#define GRAPH_VERSION (int)16// !!!increment this whever graph/node/link classes change, to obsolesce older disk files.
#endif

11
dlls/util.h
View File

@ -36,10 +36,17 @@ extern globalvars_t *gpGlobals;
// Use this instead of ALLOC_STRING on constant strings
#define STRING(offset) (const char *)(gpGlobals->pStringBase + (int)offset)
#if !defined(__amd64__) && !defined(__aarch64__) || defined(CLIENT_DLL)
#if !defined XASH_64BIT || defined(CLIENT_DLL)
#define MAKE_STRING(str) ((size_t)str - (size_t)STRING(0))
#else
#define MAKE_STRING ALLOC_STRING
static inline int MAKE_STRING(const char *szValue)
{
long long ptrdiff = szValue - STRING(0);
if( ptrdiff > INT_MAX || ptrdiff < INT_MIN )
return ALLOC_STRING(szValue);
else
return (int)ptrdiff;
}
#endif
inline edict_t *FIND_ENTITY_BY_CLASSNAME(edict_t *entStart, const char *pszName)

6
engine/studio.h
View File

@ -213,9 +213,9 @@ typedef struct cache_user_s
typedef struct
{
char label[32]; // textual name
char name[64]; // file name
int unused1; // // was "cache" - index pointer
int unused2; // was "data" - hack for group 0
char name[64]; // file name
int unused1; // was "cache" - index pointer
int unused2; // was "data" - hack for group 0
} mstudioseqgroup_t;
// sequence descriptions