metamod/dllapi.cpp
branchB-work
changeset 143 c8bb186f5851
parent 0 d15304fcb7a7
child 158 02716ab98019
     1.1 --- a/metamod/dllapi.cpp	Mon Aug 08 20:18:11 2005 +0000
     1.2 +++ b/metamod/dllapi.cpp	Thu Aug 18 16:47:27 2005 +0000
     1.3 @@ -143,10 +143,12 @@
     1.4  
     1.5  // From SDK dlls/client.cpp:
     1.6  BOOL mm_ClientConnect(edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] ) {
     1.7 +	SetPlayerQuerying(pEntity, mFALSE);
     1.8  	META_DLLAPI_HANDLE(BOOL, TRUE, FN_CLIENTCONNECT, pfnClientConnect, (pEntity, pszName, pszAddress, szRejectReason));
     1.9  	RETURN_API();
    1.10  }
    1.11  void mm_ClientDisconnect(edict_t *pEntity) {
    1.12 +	SetPlayerQuerying(pEntity, mFALSE);
    1.13  	META_DLLAPI_HANDLE_void(FN_CLIENTDISCONNECT, pfnClientDisconnect, (pEntity));
    1.14  	RETURN_API_void();
    1.15  }
    1.16 @@ -191,6 +193,7 @@
    1.17  	Plugins->refresh(PT_CHANGELEVEL);
    1.18  	Plugins->unpause_all();
    1.19  	// Plugins->retry_all(PT_CHANGELEVEL);
    1.20 +	ClearAllPlayers();
    1.21  	RETURN_API_void();
    1.22  }
    1.23  void mm_PlayerPreThink(edict_t *pEntity) {
    1.24 @@ -321,7 +324,12 @@
    1.25  	META_NEWAPI_HANDLE(int, 1, FN_SHOULDCOLLIDE, pfnShouldCollide, (pentTouched, pentOther));
    1.26  	RETURN_API();
    1.27  }
    1.28 -
    1.29 +// Added 2005/08/11 (no SDK update)
    1.30 +void mm_CvarValue(const edict_t *pEdict, const char *value) {
    1.31 +	SetPlayerQuerying(const_cast<edict_t *>(pEdict), mFALSE, NULL);
    1.32 +	META_NEWAPI_HANDLE_void(FN_CVARVALUE, pfnCvarValue, (pEdict, value));
    1.33 +	RETURN_API_void();
    1.34 +}
    1.35  
    1.36  // From SDK dlls/cbase.cpp:
    1.37  // "(wd)" indicates my comments on the functions
    1.38 @@ -454,6 +462,8 @@
    1.39  	mm_OnFreeEntPrivateData,		//! pfnOnFreeEntPrivateData()	Called right before the object's memory is freed.  Calls its destructor.
    1.40  	mm_GameShutdown,				//! pfnGameShutdown()
    1.41  	mm_ShouldCollide,				//! pfnShouldCollide()
    1.42 +	// Added 2005/08/11 (no SDK update)
    1.43 +	mm_CvarValue,					//! pfnCvarValue()
    1.44  };
    1.45  
    1.46  C_DLLEXPORT int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *interfaceVersion) 
    1.47 @@ -475,6 +485,11 @@
    1.48  		*interfaceVersion = NEW_DLL_FUNCTIONS_VERSION;
    1.49  		return(FALSE);
    1.50  	}
    1.51 -	memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS));
    1.52 +	
    1.53 +	// Detect old engine
    1.54 +	if (!IS_VALID_PTR((void *)g_engfuncs.pfnQueryClientCvarValue))
    1.55 +		memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS) - sizeof(void *));
    1.56 +	else
    1.57 +        memcpy(pNewFunctionTable, &gNewFunctionTable, sizeof(NEW_DLL_FUNCTIONS));
    1.58  	return(TRUE);
    1.59  }