Skip to content

fix(logic): improve config loading #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rushaway wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(logic): improve config loading #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions addons/sourcemod/scripting/MusicName.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public Plugin myinfo =
name = "Music Names",
author = "koen, .Rushaway",
description = "Display the name of music in chat",
version = "1.3",
version = "1.3.2",
};

char g_sCurrentSong[256];
Expand Down Expand Up @@ -103,6 +103,8 @@ public void OnMapEnd()
{
delete g_songNames;
delete g_fLastPlayedTime;
g_bConfigLoaded = false;
g_sCurrentSong = "";
}

public void OnClientDisconnected(int client)
Expand Down Expand Up @@ -191,7 +193,7 @@ public Action Command_ToggleNP(int client, int args)
//----------------------------------------------------------------------------------------------------
public Action Command_DumpMusic(int client, int args)
{
if (!g_bConfigLoaded)
if (!EnsureMusicState())
{
CReplyToCommand(client, "%t %t", "Chat Prefix", "No Config");
return Plugin_Handled;
Expand Down Expand Up @@ -237,7 +239,7 @@ public Action Command_ReloadMusicnames(int client, int args)
//----------------------------------------------------------------------------------------------------
public Action Hook_AmbientSound(char sample[PLATFORM_MAX_PATH], int &entity, float &volume, int &level, int &pitch, float pos[3], int &flags, float &delay)
{
if (!g_bConfigLoaded)
if (!EnsureMusicState())
return Plugin_Continue;

// Using "volume 0" to stop music triggers sound hook
Expand Down Expand Up @@ -362,6 +364,24 @@ stock void StringToLowerCase(char[] input)
}
}

//----------------------------------------------------------------------------------------------------
// Purpose: Ensure runtime state is valid and config is loaded
//----------------------------------------------------------------------------------------------------
stock bool EnsureMusicState()
{
if (g_songNames == null)
g_songNames = new StringMap();

if (g_fLastPlayedTime == null)
g_fLastPlayedTime = new StringMap();

if (g_bConfigLoaded)
return true;

LoadConfig();
return g_bConfigLoaded;
}

//----------------------------------------------------------------------------------------------------
// Purpose: Toggle feature
//----------------------------------------------------------------------------------------------------
Expand All @@ -374,4 +394,4 @@ stock void ToggleFeature(int client)
CPrintToChat(client, "%t %t", "Chat Prefix", "Display Status", "Enabled");
else
CPrintToChat(client, "%t %t", "Chat Prefix", "Display Status", "Disabled");
}
}