Revert mistaken vsound.cpp change
This commit is contained in:
Fyren
parent
9aba700d8c
commit
be7ef860d5
@ -630,179 +630,6 @@ static cell_t EmitSound(IPluginContext *pContext, const cell_t *params)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static cell_t EmitSound2(IPluginContext *pContext, const cell_t *params)
|
|
||||||
{
|
|
||||||
cell_t *addr, *cl_array;
|
|
||||||
CellRecipientFilter crf;
|
|
||||||
unsigned int numClients;
|
|
||||||
int client;
|
|
||||||
IGamePlayer *pPlayer = NULL;
|
|
||||||
|
|
||||||
pContext->LocalToPhysAddr(params[1], &cl_array);
|
|
||||||
numClients = params[2];
|
|
||||||
|
|
||||||
/* Client validation */
|
|
||||||
for (unsigned int i = 0; i < numClients; i++)
|
|
||||||
{
|
|
||||||
client = cl_array[i];
|
|
||||||
pPlayer = playerhelpers->GetGamePlayer(client);
|
|
||||||
|
|
||||||
if (!pPlayer)
|
|
||||||
{
|
|
||||||
return pContext->ThrowNativeError("Client index %d is invalid", client);
|
|
||||||
} else if (!pPlayer->IsInGame()) {
|
|
||||||
return pContext->ThrowNativeError("Client %d is not connected", client);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
crf.Initialize(cl_array, numClients);
|
|
||||||
|
|
||||||
char *sample;
|
|
||||||
pContext->LocalToString(params[3], &sample);
|
|
||||||
|
|
||||||
int entity = SoundReferenceToIndex(params[4]);
|
|
||||||
int channel = params[5];
|
|
||||||
float level = sp_ctof(params[6]);
|
|
||||||
int flags = params[7];
|
|
||||||
float vol = sp_ctof(params[8]);
|
|
||||||
int pitch = params[9];
|
|
||||||
int speakerentity = params[10];
|
|
||||||
|
|
||||||
Vector *pOrigin = NULL, origin;
|
|
||||||
Vector *pDir = NULL, dir;
|
|
||||||
|
|
||||||
pContext->LocalToPhysAddr(params[11], &addr);
|
|
||||||
if (addr != pContext->GetNullRef(SP_NULL_VECTOR))
|
|
||||||
{
|
|
||||||
pOrigin = &origin;
|
|
||||||
origin.x = sp_ctof(addr[0]);
|
|
||||||
origin.y = sp_ctof(addr[1]);
|
|
||||||
origin.z = sp_ctof(addr[2]);
|
|
||||||
}
|
|
||||||
|
|
||||||
pContext->LocalToPhysAddr(params[12], &addr);
|
|
||||||
if (addr != pContext->GetNullRef(SP_NULL_VECTOR))
|
|
||||||
{
|
|
||||||
pDir = &dir;
|
|
||||||
dir.x = sp_ctof(addr[0]);
|
|
||||||
dir.y = sp_ctof(addr[1]);
|
|
||||||
dir.z = sp_ctof(addr[2]);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool updatePos = params[13] ? true : false;
|
|
||||||
float soundtime = sp_ctof(params[14]);
|
|
||||||
|
|
||||||
CUtlVector<Vector> *pOrigVec = NULL;
|
|
||||||
CUtlVector<Vector> origvec;
|
|
||||||
if (params[0] > 14)
|
|
||||||
{
|
|
||||||
pOrigVec = &origvec;
|
|
||||||
for (cell_t i = 15; i <= params[0]; i++)
|
|
||||||
{
|
|
||||||
Vector vec;
|
|
||||||
pContext->LocalToPhysAddr(params[i], &addr);
|
|
||||||
vec.x = sp_ctof(addr[0]);
|
|
||||||
vec.y = sp_ctof(addr[1]);
|
|
||||||
vec.z = sp_ctof(addr[2]);
|
|
||||||
origvec.AddToTail(vec);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If we're going to a "local player" and this is a dedicated server,
|
|
||||||
* intelligently redirect each sound.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (entity == -2 && engine->IsDedicatedServer())
|
|
||||||
{
|
|
||||||
for (unsigned int i = 0; i < numClients; i++)
|
|
||||||
{
|
|
||||||
cell_t player[1];
|
|
||||||
player[0] = cl_array[i];
|
|
||||||
crf.Reset();
|
|
||||||
crf.Initialize(player, 1);
|
|
||||||
if (g_InSoundHook)
|
|
||||||
{
|
|
||||||
SH_CALL(enginesoundPatch,
|
|
||||||
static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float,
|
|
||||||
float, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int)>
|
|
||||||
(&IEngineSound::EmitSound))
|
|
||||||
(crf,
|
|
||||||
player[0],
|
|
||||||
channel,
|
|
||||||
sample,
|
|
||||||
vol,
|
|
||||||
level,
|
|
||||||
flags,
|
|
||||||
pitch,
|
|
||||||
pOrigin,
|
|
||||||
pDir,
|
|
||||||
pOrigVec,
|
|
||||||
updatePos,
|
|
||||||
soundtime,
|
|
||||||
speakerentity);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
engsound->EmitSound(crf,
|
|
||||||
player[0],
|
|
||||||
channel,
|
|
||||||
sample,
|
|
||||||
vol,
|
|
||||||
level,
|
|
||||||
flags,
|
|
||||||
pitch,
|
|
||||||
pOrigin,
|
|
||||||
pDir,
|
|
||||||
pOrigVec,
|
|
||||||
updatePos,
|
|
||||||
soundtime,
|
|
||||||
speakerentity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (g_InSoundHook)
|
|
||||||
{
|
|
||||||
SH_CALL(enginesoundPatch,
|
|
||||||
static_cast<void (IEngineSound::*)(IRecipientFilter &, int, int, const char*, float,
|
|
||||||
float, int, int, const Vector *, const Vector *, CUtlVector<Vector> *, bool, float, int)>
|
|
||||||
(&IEngineSound::EmitSound))
|
|
||||||
(crf,
|
|
||||||
entity,
|
|
||||||
channel,
|
|
||||||
sample,
|
|
||||||
vol,
|
|
||||||
level,
|
|
||||||
flags,
|
|
||||||
pitch,
|
|
||||||
pOrigin,
|
|
||||||
pDir,
|
|
||||||
pOrigVec,
|
|
||||||
updatePos,
|
|
||||||
soundtime,
|
|
||||||
speakerentity);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
engsound->EmitSound(crf,
|
|
||||||
entity,
|
|
||||||
channel,
|
|
||||||
sample,
|
|
||||||
vol,
|
|
||||||
level,
|
|
||||||
flags,
|
|
||||||
pitch,
|
|
||||||
pOrigin,
|
|
||||||
pDir,
|
|
||||||
pOrigVec,
|
|
||||||
updatePos,
|
|
||||||
soundtime,
|
|
||||||
speakerentity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static cell_t EmitSentence(IPluginContext *pContext, const cell_t *params)
|
static cell_t EmitSentence(IPluginContext *pContext, const cell_t *params)
|
||||||
{
|
{
|
||||||
cell_t *addr;
|
cell_t *addr;
|
||||||
@ -959,7 +786,6 @@ sp_nativeinfo_t g_SoundNatives[] =
|
|||||||
{
|
{
|
||||||
{"EmitAmbientSound", EmitAmbientSound},
|
{"EmitAmbientSound", EmitAmbientSound},
|
||||||
{"EmitSentence", EmitSentence},
|
{"EmitSentence", EmitSentence},
|
||||||
{"EmitSound2", EmitSound2},
|
|
||||||
{"EmitSound", EmitSound},
|
{"EmitSound", EmitSound},
|
||||||
{"FadeClientVolume", FadeClientVolume},
|
{"FadeClientVolume", FadeClientVolume},
|
||||||
{"GetSoundDuration", GetSoundDuration},
|
{"GetSoundDuration", GetSoundDuration},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user