UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #192 from alliedmodders/no-random-iface

Browse Source 
Use directly-exported random functions on vstdlib rather than IUniformRandomStream (r=dvander).
This commit is contained in:
Nicholas Hastings 2014-11-10 13:26:12 -05:00
commit d6533e3219
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/smn_halflife.cpp
View File

@ -35,9 +35,11 @@
#include "PlayerManager.h" #include "PlayerManager.h"
#include "HalfLife2.h" #include "HalfLife2.h"
#include <vstdlib/random.h>
static cell_t SetRandomSeed(IPluginContext *pContext, const cell_t *params) static cell_t SetRandomSeed(IPluginContext *pContext, const cell_t *params)
{ {
engrandom->SetSeed(params[1]); ::RandomSeed(params[1]);
return 1; return 1;
} }
@ -47,14 +49,14 @@ static cell_t GetRandomFloat(IPluginContext *pContext, const cell_t *params)
float fMin = sp_ctof(params[1]); float fMin = sp_ctof(params[1]);
float fMax = sp_ctof(params[2]); float fMax = sp_ctof(params[2]);
float fRandom = engrandom->RandomFloat(fMin, fMax); float fRandom = ::RandomFloat(fMin, fMax);
return sp_ftoc(fRandom); return sp_ftoc(fRandom);
} }
static cell_t GetRandomInt(IPluginContext *pContext, const cell_t *params) static cell_t GetRandomInt(IPluginContext *pContext, const cell_t *params)
{ {
return engrandom->RandomInt(params[1], params[2]); return ::RandomInt(params[1], params[2]);
} }
static cell_t IsMapValid(IPluginContext *pContext, const cell_t *params) static cell_t IsMapValid(IPluginContext *pContext, const cell_t *params)

2
core/sourcemm_api.cpp
View File

@ -45,7 +45,6 @@ ISmmPluginManager *g_pMMPlugins = NULL;
CGlobalVars *gpGlobals = NULL; CGlobalVars *gpGlobals = NULL;
ICvar *icvar = NULL; ICvar *icvar = NULL;
IGameEventManager2 *gameevents = NULL; IGameEventManager2 *gameevents = NULL;
IUniformRandomStream *engrandom = NULL;
CallClass<IVEngineServer> *enginePatch = NULL; CallClass<IVEngineServer> *enginePatch = NULL;
CallClass<IServerGameDLL> *gamedllPatch = NULL; CallClass<IServerGameDLL> *gamedllPatch = NULL;
IPlayerInfoManager *playerinfo = NULL; IPlayerInfoManager *playerinfo = NULL;
@ -68,7 +67,6 @@ bool SourceMod_Core::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen
GET_V_IFACE_CURRENT(GetServerFactory, serverClients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS); GET_V_IFACE_CURRENT(GetServerFactory, serverClients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
GET_V_IFACE_CURRENT(GetEngineFactory, icvar, ICvar, CVAR_INTERFACE_VERSION); GET_V_IFACE_CURRENT(GetEngineFactory, icvar, ICvar, CVAR_INTERFACE_VERSION);
GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2);
GET_V_IFACE_CURRENT(GetEngineFactory, engrandom, IUniformRandomStream, VENGINE_SERVER_RANDOM_INTERFACE_VERSION);
GET_V_IFACE_CURRENT(GetFileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION); GET_V_IFACE_CURRENT(GetFileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION);
GET_V_IFACE_CURRENT(GetFileSystemFactory, filesystem, IFileSystem, FILESYSTEM_INTERFACE_VERSION); GET_V_IFACE_CURRENT(GetFileSystemFactory, filesystem, IFileSystem, FILESYSTEM_INTERFACE_VERSION);
GET_V_IFACE_CURRENT(GetEngineFactory, enginesound, IEngineSound, IENGINESOUND_SERVER_INTERFACE_VERSION); GET_V_IFACE_CURRENT(GetEngineFactory, enginesound, IEngineSound, IENGINESOUND_SERVER_INTERFACE_VERSION);

2
core/sourcemm_api.h
View File

@ -47,7 +47,6 @@
#include <eiface.h> #include <eiface.h>
#include <igameevents.h> #include <igameevents.h>
#include <iplayerinfo.h> #include <iplayerinfo.h>
#include <random.h>
#include <filesystem.h> #include <filesystem.h>
#include <IEngineSound.h> #include <IEngineSound.h>
#include <toolframework/itoolentity.h> #include <toolframework/itoolentity.h>
@ -99,7 +98,6 @@ extern CGlobalVars *gpGlobals;
extern IGameEventManager2 *gameevents; extern IGameEventManager2 *gameevents;
extern SourceHook::CallClass<IVEngineServer> *enginePatch; extern SourceHook::CallClass<IVEngineServer> *enginePatch;
extern SourceHook::CallClass<IServerGameDLL> *gamedllPatch; extern SourceHook::CallClass<IServerGameDLL> *gamedllPatch;
extern IUniformRandomStream *engrandom;
extern IPlayerInfoManager *playerinfo; extern IPlayerInfoManager *playerinfo;
extern IBaseFileSystem *basefilesystem; extern IBaseFileSystem *basefilesystem;
extern IFileSystem *filesystem; extern IFileSystem *filesystem;