64 bit support

FWGS · Apr 22, 2016 · d287ed4 · d287ed4
1 parent 3348f5d
commit d287ed4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/cl_dll/StudioModelRenderer.cpp b/cl_dll/StudioModelRenderer.cpp
@@ -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;

diff --git a/dlls/nodes.cpp b/dlls/nodes.cpp
@@ -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;

diff --git a/dlls/util.cpp b/dlls/util.cpp
@@ -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:

diff --git a/dlls/util.h b/dlls/util.h
@@ -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);

diff --git a/engine/studio.h b/engine/studio.h
@@ -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