metamod/mutil.cpp
branchB-work
changeset 158 02716ab98019
parent 149 610def0c5b51
child 195 c7737ac9af4f
     1.1 --- a/metamod/mutil.cpp	Sun Aug 21 21:39:47 2005 +0000
     1.2 +++ b/metamod/mutil.cpp	Sun Aug 21 21:52:35 2005 +0000
     1.3 @@ -302,7 +302,7 @@
     1.4  	{
     1.5  		if (plugin_handle)
     1.6  			*plugin_handle = NULL;
     1.7 -		return (int)meta_errno;
     1.8 +		return meta_errno;
     1.9  	} else {
    1.10  		if (plugin_handle)
    1.11  			*plugin_handle = (void *)pl_loaded->handle;
    1.12 @@ -328,14 +328,14 @@
    1.13  		findp = Plugins->find_match(fname);
    1.14  
    1.15  	if (!findp)
    1.16 -		return (int)ME_NOTUNIQ;
    1.17 +		return meta_errno;
    1.18  
    1.19  	meta_errno = ME_NOERROR;
    1.20  
    1.21  	if (findp->plugin_unload(plid, now, reason))
    1.22  		return 0;
    1.23  	
    1.24 -	return (int)meta_errno;
    1.25 +	return meta_errno;
    1.26  }
    1.27  
    1.28  int mutil_UnloadMetaPluginByHandle(plid_t plid, void *plugin_handle, PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
    1.29 @@ -348,27 +348,21 @@
    1.30  	}
    1.31  
    1.32  	if (!(findp=Plugins->find((DLHANDLE)plugin_handle)))
    1.33 -		return (int)ME_NOTUNIQ;
    1.34 +		return ME_NOTFOUND;
    1.35  	
    1.36  	meta_errno = ME_NOERROR;
    1.37  
    1.38  	if (findp->plugin_unload(plid, now, reason))
    1.39  		return 0;
    1.40  
    1.41 -	return (int)meta_errno;
    1.42 +	return meta_errno;
    1.43  }
    1.44  
    1.45 -const char *mutil_IsQueryingClientCvar(plid_t plid, const edict_t *pEdict)
    1.46 +const char *mutil_IsQueryingClientCvar(plid_t /*plid*/, const edict_t *pEdict)
    1.47  {
    1.48 -	int index = ENTINDEX(const_cast<edict_t *>(pEdict));
    1.49 +	return g_Players.is_querying_cvar(pEdict);
    1.50 +}
    1.51  
    1.52 -	if (index < 1 || index > gpGlobals->maxClients)
    1.53 -	{
    1.54 -		RETURN_ERRNO(NULL, ME_NOTFOUND);
    1.55 -	}
    1.56 -
    1.57 -	return g_Players[index].cvarName;
    1.58 -}
    1.59  
    1.60  #ifdef UNFINISHED
    1.61  int mutil_HookGameEvent(plid_t plid, game_event_t event,