Fix hl2sb gamemode

Author: luttje

…es/RecipientFilter/AddRecipientsByPAS.md …es/RecipientFilter/AddRecipientsByPas.mddocs/classes/RecipientFilter/AddRecipientsByPAS.md renamed to docs/classes/RecipientFilter/AddRecipientsByPas.md docs/classes/RecipientFilter/AddRecipientsByPAS.md renamed to docs/classes/RecipientFilter/AddRecipientsByPas.md

@@ -1,6 +1,6 @@
 ---
 template: lua-class-function.html
-title: AddRecipientsByPAS
+title: AddRecipientsByPas
 icon: lua-shared
 tags:
   - lua
@@ -9,10 +9,10 @@ tags:
   - needs-example
 lua:
   library: RecipientFilter
-  function: AddRecipientsByPAS
+  function: AddRecipientsByPas
   realm: shared
   description: "Adds recipients by potentially audible set"
-  
+
   arguments:
   - position: 1
     name: "filter"
@@ -21,9 +21,9 @@ lua:
     name: "position"
     type: Vector
   returns:
-    
+
 ---
 
 <div class="lua__search__keywords">
-RecipientFilter:AddRecipientsByPAS &#x2013; Adds recipients by potentially audible set
+RecipientFilter:AddRecipientsByPas &#x2013; Adds recipients by potentially audible set
 </div>

…es/RecipientFilter/AddRecipientsByPVS.md …es/RecipientFilter/AddRecipientsByPvs.mddocs/classes/RecipientFilter/AddRecipientsByPVS.md renamed to docs/classes/RecipientFilter/AddRecipientsByPvs.md docs/classes/RecipientFilter/AddRecipientsByPVS.md renamed to docs/classes/RecipientFilter/AddRecipientsByPvs.md

@@ -1,6 +1,6 @@
 ---
 template: lua-class-function.html
-title: AddRecipientsByPVS
+title: AddRecipientsByPvs
 icon: lua-shared
 tags:
   - lua
@@ -9,10 +9,10 @@ tags:
   - needs-example
 lua:
   library: RecipientFilter
-  function: AddRecipientsByPVS
+  function: AddRecipientsByPvs
   realm: shared
   description: "Adds recipients by potentially visible set"
-  
+
   arguments:
   - position: 1
     name: "filter"
@@ -21,9 +21,9 @@ lua:
     name: "position"
     type: Vector
   returns:
-    
+
 ---
 
 <div class="lua__search__keywords">
-RecipientFilter:AddRecipientsByPVS &#x2013; Adds recipients by potentially visible set
+RecipientFilter:AddRecipientsByPvs &#x2013; Adds recipients by potentially visible set
 </div>

game/experiment/addons/gmod_compatibility/scripts/lua/includes/modules/gmod_compatibility/sh_init.lua

@@ -267,6 +267,7 @@ engine.TickInterval = Engines.GetIntervalPerTick
 SoundDuration = Engines.GetSoundDuration
 GetHostName = Engines.GetServerName
 Player = Players.FindByUserId
+EmitSound = Sounds.Play
 
 PrecacheParticleSystem = ParticleSystems.Precache
 GetPredictionPlayer = Predictions.GetPredictionPlayer

game/experiment/gamemodes/hl2sb/gamemode/shared.lua

@@ -28,7 +28,7 @@ function GM:FlWeaponTryRespawn(targetWeapon)
 	return 0
 end
 
-function GM:PlayerPlayStepSound(client, vecOrigin, psurface, fvol, force)
+function GM:PlayerPlayStepSound(client, vecOrigin, psurface, volume, force)
 	if (Engines.GetMaxClients() > 1 and ConsoleVariables.FindVariable("sv_footsteps"):GetFloat() == 0) then
 		return false
 	end
@@ -69,32 +69,25 @@ function GM:PlayerPlayStepSound(client, vecOrigin, psurface, fvol, force)
 		end
 
 		-- Only cache if there's one option.  Otherwise we'd never here any other sounds
-		if (params.count == 1) then
-			client:SetStepSoundCache(nSide, "m_usSoundNameIndex", stepSoundName)
-			client:SetStepSoundCache(nSide, "m_SoundParameters", params)
-		end
+        if (params.count == 1) then
+            client:SetStepSoundCache(nSide, "m_usSoundNameIndex", stepSoundName)
+            client:SetStepSoundCache(nSide, "m_SoundParameters", params)
+        end
+
+		stepSoundName = pSoundName
 	end
 
 	local filter = RecipientFilters.Create()
-	filter:AddRecipientsByPAS(vecOrigin)
+	filter:AddRecipientsByPas(vecOrigin)
 
 	if not CLIENT then
 		-- in MP, server removes all players in the vecOrigin's PVS, these players generate the footsteps client side
 		if (Engines.GetMaxClients() > 1) then
-			filter:RemoveRecipientsByPVS(vecOrigin)
+			filter:RemoveRecipientsByPvs(vecOrigin)
 		end
 	end
 
-	local ep = {}
-	ep.m_nChannel = 4; -- CHAN_BODY
-	ep.m_pSoundName = params.soundname
-	ep.m_flVolume = fvol
-	ep.m_SoundLevel = params.soundlevel
-	ep.m_nFlags = 0
-	ep.m_nPitch = params.pitch
-	ep.m_pOrigin = vecOrigin
-
-	_R.Entity.EmitSound(filter, client:GetEntityIndex(), ep)
+	Sounds.Play(stepSoundName, vecOrigin, 0, _E.SOUND_CHANNEL.BODY, volume, params.soundlevel, 0, params.pitch, 0, filter)
 	return false
 end
 

src/game/shared/gmod_luabase.cpp

@@ -94,7 +94,9 @@ int CLuaBase::CreateMetaTable( const char *strName )
     }
     else
     {
-        Assert( 0 );  // TODO: Does this happen?
+        // TODO: This else is reached when running `lua_run require("mysqloo")` twice,
+        //       causing it to run this CreateMetaTable method twice.
+        return m_mapMetaTableNameToID.Find( strName );
     }
 
     return m_mapMetaTableNameToID.Count() - 1;

src/game/shared/lrecipientfilter.cpp

@@ -78,7 +78,7 @@ LUA_BINDING_BEGIN( RecipientFilter, AddRecipient, "class", "Adds a single recipi
 }
 LUA_BINDING_END()
 
-LUA_BINDING_BEGIN( RecipientFilter, AddRecipientsByPAS, "class", "Adds recipients by potentially audible set" )
+LUA_BINDING_BEGIN( RecipientFilter, AddRecipientsByPas, "class", "Adds recipients by potentially audible set" )
 {
     LUA_BINDING_ARGUMENT( luaL_checkrecipientfilter, 1, "filter" ).AddRecipientsByPAS( LUA_BINDING_ARGUMENT( luaL_checkvector, 2, "position" ) );
     return 0;

src/public/lsounds.cpp

@@ -3,6 +3,7 @@
 #include "luasrclib.h"
 #include <lsounds.h>
 #include <engine/IEngineSound.h>
+#include <lrecipientfilter.h>
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -551,10 +552,23 @@ LUA_BINDING_BEGIN( Sounds, Play, "library", "Plays a sound emitting from a place
 {
     const char *pszSoundName = LUA_BINDING_ARGUMENT( luaL_checkstring, 1, "soundName" );  // doc: sound script name or sound file name relative to sound/ folder
     const Vector vecOrigin = LUA_BINDING_ARGUMENT( luaL_checkvector, 2, "origin" );       // doc: position of the sound
-    soundlevel_t soundLevel = LUA_BINDING_ARGUMENT_ENUM_WITH_DEFAULT( soundlevel_t, 3, SNDLVL_NORM, "soundLevel" );
-    float flPitchPercent = LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 4, 100, "pitchPercent" );
+    int entityIndex = ( int )LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 3, SOUND_FROM_WORLD, "entity" );
+    SOUND_CHANNEL channel = ( SOUND_CHANNEL )LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 4, SOUND_CHANNEL::CHAN_AUTO, "channel" );
     float flVolume = LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 5, 1, "volume" );
-    int nDSP = LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 6, 0, "dsp" );
+    soundlevel_t soundLevel = LUA_BINDING_ARGUMENT_ENUM_WITH_DEFAULT( soundlevel_t, 6, SNDLVL_NORM, "soundLevel" );
+    int soundFlags = LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 7, 0, "soundFlags" );
+    float flPitchPercent = LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 8, 100, "pitchPercent" );
+    int nDSP = LUA_BINDING_ARGUMENT_WITH_DEFAULT( luaL_optnumber, 9, 0, "dsp" );
+    lua_CRecipientFilter filter;
+
+    if ( lua_isrecipientfilter( L, 10 ) )
+    {
+        filter = LUA_BINDING_ARGUMENT_NILLABLE( luaL_checkrecipientfilter, 10, "filter" );
+    }
+    else
+    {
+        filter = CPASAttenuationFilter( vecOrigin, soundLevel );
+    }
 
     float duration = 0;
 
@@ -568,10 +582,10 @@ LUA_BINDING_BEGIN( Sounds, Play, "library", "Plays a sound emitting from a place
     params.m_flSoundTime = 0;
     params.m_pflSoundDuration = &duration;
     params.m_bWarnOnDirectWaveReference = false;
+    params.m_nChannel = channel;
+    params.m_nFlags = soundFlags;
 
-    CPVSFilter filter( vecOrigin );
-
-    CBaseEntity::EmitSound( filter, SOUND_FROM_WORLD, params );
+    CBaseEntity::EmitSound( filter, entityIndex, params );
 
     lua_pushnumber( L, duration );