diff -r 2f1423fcd624 -r 7fee65f95eab metamod/dllapi.cpp --- a/metamod/dllapi.cpp Tue Aug 23 20:06:18 2005 +0000 +++ b/metamod/dllapi.cpp Thu Nov 24 00:27:02 2005 +0000 @@ -331,6 +331,12 @@ RETURN_API_void(); } +//Added 2005/11/22 (no SDK update) +void mm_CvarValue2(const edict_t *pEdict, int requestID, const char *cvarName, const char *value) { + META_NEWAPI_HANDLE_void(FN_CVARVALUE2, pfnCvarValue2, (pEdict, requestID, cvarName, value)); + RETURN_API_void(); +} + // From SDK dlls/cbase.cpp: // "(wd)" indicates my comments on the functions static DLL_FUNCTIONS gFunctionTable = @@ -469,11 +475,6 @@ C_DLLEXPORT int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *interfaceVersion) { META_DEBUG(6, ("called: GetNewDLLFunctions; version=%d", *interfaceVersion)); - // Don't provide these functions to engine if gamedll doesn't provide - // them. Otherwise, we're in the position of having to provide answers - // we can't necessarily provide (for instance, ShouldCollide())... - if(!GameDLL.funcs.newapi_table) - return(FALSE); if(!pNewFunctionTable) { META_ERROR("GetNewDLLFunctions called with null pNewFunctionTable"); @@ -486,10 +487,16 @@ return(FALSE); } - // Detect old engine - if (!IS_VALID_PTR((void *)g_engfuncs.pfnQueryClientCvarValue)) - memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS) - sizeof(FN_CVARVALUE)); - else + // Detect old engines + if (!IS_VALID_PTR((void *)g_engfuncs.pfnQueryClientCvarValue2)) + { + if (!IS_VALID_PTR((void *)g_engfuncs.pfnQueryClientCvarValue)) + memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS) - sizeof(FN_CVARVALUE) - sizeof(FN_CVARVALUE2)); + else + memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS) - sizeof(FN_CVARVALUE2)); + } else { memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS)); + } + return(TRUE); }