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

64 bit support

This commit is contained in:
mittorn 2016-04-22 14:27:54 +00:00
parent 3348f5d214
commit d287ed4463
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/StudioModelRenderer.cpp
View File

@ -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;

8
dlls/nodes.cpp
View File

@ -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;

6
dlls/util.cpp
View File

@ -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:

5
dlls/util.h
View File

@ -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);

4
engine/studio.h
View File

@ -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