mirror of https://github.com/FWGS/hlsdk-xash3d
Merge branch 'master' of https://github.com/SDLash3D/hlsdk-xash3d into gravgun
This commit is contained in:
commit
79132da10b
|
@ -21,7 +21,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
|
|||
LOCAL_MODULE_FILENAME = libclient_hardfp
|
||||
endif
|
||||
|
||||
LOCAL_CFLAGS += -fsigned-char -DCLIENT_DLL=1
|
||||
LOCAL_CFLAGS += -DCLIENT_DLL=1
|
||||
|
||||
SRCS=
|
||||
SRCS_C=
|
||||
|
|
|
@ -377,7 +377,7 @@ mstudioanim_t *CStudioModelRenderer::StudioGetAnim( model_t *m_pSubModel, mstudi
|
|||
|
||||
if (pseqdesc->seqgroup == 0)
|
||||
{
|
||||
return (mstudioanim_t *)((byte *)m_pStudioHeader + pseqgroup->data + pseqdesc->animindex);
|
||||
return (mstudioanim_t *)((byte *)m_pStudioHeader + pseqdesc->animindex);
|
||||
}
|
||||
|
||||
paSequences = (cache_user_t *)m_pSubModel->submodels;
|
||||
|
|
|
@ -201,6 +201,12 @@ void IN_Move( float frametime, usercmd_t *cmd )
|
|||
IN_ToggleButtons( ac_forwardmove / ac_movecount, ac_sidemove / ac_movecount );
|
||||
if( ac_forwardmove ) cmd->forwardmove = ac_forwardmove * cl_forwardspeed->value / ac_movecount;
|
||||
if( ac_sidemove ) cmd->sidemove = ac_sidemove * cl_sidespeed->value / ac_movecount;
|
||||
if (in_speed.state & 1)
|
||||
{
|
||||
cmd->forwardmove *= cl_movespeedkey->value;
|
||||
cmd->sidemove *= cl_movespeedkey->value;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ac_sidemove = ac_forwardmove = rel_pitch = rel_yaw = 0;
|
||||
|
|
|
@ -1333,7 +1333,7 @@ int V_FindViewModelByWeaponModel(int weaponindex)
|
|||
int len = strlen( weaponModel->name );
|
||||
int i = 0;
|
||||
|
||||
while ( modelmap[i] != NULL )
|
||||
while ( modelmap[i][0] != NULL )
|
||||
{
|
||||
if ( !strnicmp( weaponModel->name, modelmap[i][0], len ) )
|
||||
{
|
||||
|
|
|
@ -3312,10 +3312,10 @@ void CGraph :: ComputeStaticRoutingTables( void )
|
|||
}
|
||||
ALERT( at_aiconsole, "Size of Routes = %d\n", nTotalCompressedSize);
|
||||
}
|
||||
if (Routes) delete Routes;
|
||||
if (BestNextNodes) delete BestNextNodes;
|
||||
if (pRoute) delete pRoute;
|
||||
if (pMyPath) delete pMyPath;
|
||||
if (Routes) delete[] Routes;
|
||||
if (BestNextNodes) delete[] BestNextNodes;
|
||||
if (pRoute) delete[] pRoute;
|
||||
if (pMyPath) delete[] pMyPath;
|
||||
Routes = 0;
|
||||
BestNextNodes = 0;
|
||||
pRoute = 0;
|
||||
|
|
|
@ -2372,13 +2372,13 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou
|
|||
break;
|
||||
|
||||
case FIELD_POINTER:
|
||||
*((int *)pOutputData) = *( int *)pInputData;
|
||||
*((void**)pOutputData) = *( void **)pInputData;
|
||||
break;
|
||||
case FIELD_FUNCTION:
|
||||
if ( strlen( (char *)pInputData ) == 0 )
|
||||
*((int *)pOutputData) = 0;
|
||||
*((void**)pOutputData) = 0;
|
||||
else
|
||||
*((int *)pOutputData) = FUNCTION_FROM_NAME( (char *)pInputData );
|
||||
*((void**)pOutputData) = FUNCTION_FROM_NAME( (char *)pInputData );
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -36,8 +36,11 @@ 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(CLIENT_DLL)
|
||||
#define MAKE_STRING(str) ((int)str - (int)STRING(0))
|
||||
|
||||
#else
|
||||
#define MAKE_STRING ALLOC_STRING
|
||||
#endif
|
||||
inline edict_t *FIND_ENTITY_BY_CLASSNAME(edict_t *entStart, const char *pszName)
|
||||
{
|
||||
return FIND_ENTITY_BY_STRING(entStart, "classname", pszName);
|
||||
|
|
|
@ -215,7 +215,9 @@ typedef struct
|
|||
char label[32]; // textual name
|
||||
char name[64]; // file name
|
||||
cache_user_t cache; // cache index pointer
|
||||
#ifndef __amd64
|
||||
int data; // hack for group 0
|
||||
#endif
|
||||
} mstudioseqgroup_t;
|
||||
|
||||
// sequence descriptions
|
||||
|
@ -366,4 +368,4 @@ typedef struct
|
|||
short s,t; // s,t position on skin
|
||||
} mstudiotrivert_t;
|
||||
|
||||
#endif//STUDIO_H
|
||||
#endif//STUDIO_H
|
||||
|
|
Loading…
Reference in New Issue