Commit new version of bug 5942: New functions for SDKTools to get information from game_sound files.

extensions/sdktools/extension.cpp

@@ -66,6 +66,7 @@ IPlayerInfoManager *playerinfomngr = NULL;
 ICvar *icvar = NULL;
 IServer *iserver = NULL;
 CGlobalVars *gpGlobals;
+ISoundEmitterSystemBase *soundemitterbase = NULL;
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 IServerTools *servertools = NULL;
@@ -258,6 +259,7 @@ bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	GET_V_IFACE_ANY(GetServerFactory, servertools, IServerTools, VSERVERTOOLS_INTERFACE_VERSION);
 #endif
+	GET_V_IFACE_ANY(GetEngineFactory, soundemitterbase, ISoundEmitterSystemBase, SOUNDEMITTERSYSTEM_INTERFACE_VERSION);
 
 	gpGlobals = ismm->GetCGlobals();
 	enginePatch = SH_GET_CALLCLASS(engine);

extensions/sdktools/extension.h

@@ -50,6 +50,7 @@
 #include <convar.h>
 #include <iserver.h>
 #include <cdll_int.h>
+#include "SoundEmitterSystem/isoundemittersystembase.h"
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 #include <itoolentity.h>
@@ -124,6 +125,7 @@ extern CGlobalVars *gpGlobals;
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 extern IServerTools *servertools;
 #endif
+extern ISoundEmitterSystemBase *soundemitterbase;
 /* Interfaces from SourceMod */
 extern IBinTools *g_pBinTools;
 extern IGameConfig *g_pGameConf;

extensions/sdktools/vsound.cpp

@@ -512,6 +512,75 @@ RETURN_META_NEWPARAMS(
 #endif
 }
 
+bool GetSoundParams(CSoundParameters *soundParams, const char *soundname, cell_t entindex)
+{
+	if ( !soundname[0] )
+		return false;
+
+#if SOURCE_ENGINE >= SE_PORTAL2
+	HSOUNDSCRIPTHASH index = (HSOUNDSCRIPTHASH)soundemitterbase->GetSoundIndex(soundname);
+#else
+	HSOUNDSCRIPTHANDLE index = (HSOUNDSCRIPTHANDLE)soundemitterbase->GetSoundIndex(soundname);
+#endif
+	if (!soundemitterbase->IsValidIndex(index))
+		return false;
+
+	gender_t gender = GENDER_NONE;
+
+	// I don't know if gender applies to any mutliplayer games, but just in case...
+	// Of course, if it's SOUND_FROM_PLAYER, we have no idea which gender it is
+	int ent = SoundReferenceToIndex(entindex);
+	if (ent > 0)
+	{
+		edict_t *edict = gamehelpers->EdictOfIndex(ent);
+		if (edict != NULL)
+		{
+			IServerEntity *serverEnt = edict->GetIServerEntity();
+			if (serverEnt != NULL)
+			{
+				const char *actormodel = STRING(serverEnt->GetModelName());
+				gender = soundemitterbase->GetActorGender(actormodel);
+			}
+		}
+	}
+
+	soundemitterbase->GetParametersForSoundEx(soundname, index, *soundParams, gender);
+	return true;
+}
+
+bool InternalPrecacheScriptSound(const char *soundname)
+{
+	int soundIndex = soundemitterbase->GetSoundIndex(soundname);
+	if (!soundemitterbase->IsValidIndex(soundIndex))
+	{
+		return false;
+	}
+
+	CSoundParametersInternal *internal = soundemitterbase->InternalGetParametersForSound(soundIndex);
+
+	if (!internal)
+		return false;
+
+	int waveCount = internal->NumSoundNames();
+
+	if (!waveCount)
+	{
+		return false;
+	}
+
+	for (int wave = 0; wave < waveCount; wave++)
+	{
+		const char* waveName = soundemitterbase->GetWaveName(internal->GetSoundNames()[wave].symbol);
+		// return true even if we precache no new wavs
+		if (!engsound->IsSoundPrecached(waveName))
+		{
+			engsound->PrecacheSound(waveName);
+		}
+	}
+
+	return true;
+}
+
 /************************
 *                       *
 * Sound Related Natives *
@@ -1135,6 +1204,51 @@ static cell_t smn_GetDistGainFromSoundLevel(IPluginContext *pContext, const cell
 	return sp_ftoc(engsound->GetDistGainFromSoundLevel((soundlevel_t)decibel, distance));
 }
 
+// native bool:GetGameSoundParams(const String:gameSound[], &channel, &soundLevel, &Float:volume, &pitch, String:sample[], maxlength, entity=SOUND_FROM_WORLD)
+static cell_t smn_GetGameSoundParams(IPluginContext *pContext, const cell_t *params)
+{
+	char *soundname;
+	pContext->LocalToString(params[1], &soundname);
+
+	CSoundParameters soundParams;
+
+	if (!GetSoundParams(&soundParams, soundname, params[8]))
+		return false;
+
+	cell_t *channel;
+	cell_t *fakeVolume;
+	cell_t *pitch;
+	cell_t *soundLevel;
+
+	pContext->LocalToPhysAddr(params[2], &channel);
+	pContext->LocalToPhysAddr(params[3], &soundLevel);
+	pContext->LocalToPhysAddr(params[4], &fakeVolume);
+	pContext->LocalToPhysAddr(params[5], &pitch);
+
+	*channel = soundParams.channel;
+	*pitch = soundParams.pitch;
+	*soundLevel = (cell_t)soundParams.soundlevel;
+	*fakeVolume = sp_ftoc(soundParams.volume);
+
+	pContext->StringToLocal(params[6], params[7], soundParams.soundname);
+
+	// Precache the sound we're returning
+	if (!engsound->IsSoundPrecached(soundParams.soundname))
+	{
+		InternalPrecacheScriptSound(soundname);
+	}
+
+	return true;
+}
+
+// native bool:PrecacheScriptSound(const String:soundname[])
+static cell_t smn_PrecacheScriptSound(IPluginContext *pContext, const cell_t *params)
+{
+	char *soundname;
+	pContext->LocalToString(params[1], &soundname);
+	return InternalPrecacheScriptSound(soundname);
+}
+
 sp_nativeinfo_t g_SoundNatives[] = 
 {
 	{"EmitAmbientSound",		EmitAmbientSound},
@@ -1149,5 +1263,7 @@ sp_nativeinfo_t g_SoundNatives[] =
 	{"RemoveAmbientSoundHook",	smn_RemoveAmbientSoundHook},
 	{"RemoveNormalSoundHook",	smn_RemoveNormalSoundHook},
 	{"GetDistGainFromSoundLevel", smn_GetDistGainFromSoundLevel},
+	{"GetDistGainFromSoundLevel", smn_GetDistGainFromSoundLevel},
+	{"GetGameSoundParams",		smn_GetGameSoundParams},
 	{NULL,						NULL},
 };