Skip to content

Commit b248763

Browse files
committed
All: Don't open .pk3 files as OpenAL drivers
1 parent b6ff2bc commit b248763

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Diff for: MP/code/client/snd_openal.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -2618,11 +2618,17 @@ qboolean S_AL_Init( soundInterface_t *si )
26182618
s_alRolloff = Cvar_Get( "s_alRolloff", "2", CVAR_CHEAT);
26192619
s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_CHEAT);
26202620

2621-
s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH );
2621+
s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED );
26222622

26232623
s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH );
26242624
s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
26252625

2626+
if ( COM_CompareExtension( s_alDriver->string, ".pk3" ) )
2627+
{
2628+
Com_Printf( "Rejecting DLL named \"%s\"", s_alDriver->string );
2629+
return qfalse;
2630+
}
2631+
26262632
// Load QAL
26272633
if( !QAL_Init( s_alDriver->string ) )
26282634
{

Diff for: SP/code/client/snd_openal.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -2675,11 +2675,17 @@ qboolean S_AL_Init( soundInterface_t *si )
26752675
s_alGraceDistance = Cvar_Get("s_alGraceDistance", "512", CVAR_ARCHIVE);
26762676
s_alTalkAnims = Cvar_Get("s_alTalkAnims", "160", CVAR_ARCHIVE);
26772677

2678-
s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH );
2678+
s_alDriver = Cvar_Get( "s_alDriver", ALDRIVER_DEFAULT, CVAR_ARCHIVE | CVAR_LATCH | CVAR_PROTECTED );
26792679

26802680
s_alInputDevice = Cvar_Get( "s_alInputDevice", "", CVAR_ARCHIVE | CVAR_LATCH );
26812681
s_alDevice = Cvar_Get("s_alDevice", "", CVAR_ARCHIVE | CVAR_LATCH);
26822682

2683+
if ( COM_CompareExtension( s_alDriver->string, ".pk3" ) )
2684+
{
2685+
Com_Printf( "Rejecting DLL named \"%s\"", s_alDriver->string );
2686+
return qfalse;
2687+
}
2688+
26832689
// Load QAL
26842690
if( !QAL_Init( s_alDriver->string ) )
26852691
{

0 commit comments

Comments
 (0)