UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved error reporting in basebans custom reasons loading.

Browse Source
This commit is contained in:
Asher Baker 2014-07-30 16:30:01 +01:00
parent b979d707db
commit eab6ac748f
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/basebans.sp
View File

@ -58,22 +58,12 @@ new String:g_BanReasonsPath[PLATFORM_MAX_PATH];
#include "basebans/ban.sp" #include "basebans/ban.sp"
public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max)
{
BuildPath(Path_SM, g_BanReasonsPath, sizeof(g_BanReasonsPath), "configs/banreasons.txt");
if(LoadBanReasons())
{
return APLRes_Success;
}
else
{
Format(error, err_max, "Couldn't load file %s: See log for details.", g_BanReasonsPath);
return APLRes_Failure;
}
}
public OnPluginStart() public OnPluginStart()
{ {
BuildPath(Path_SM, g_BanReasonsPath, sizeof(g_BanReasonsPath), "configs/banreasons.txt");
LoadBanReasons();
LoadTranslations("common.phrases"); LoadTranslations("common.phrases");
LoadTranslations("basebans.phrases"); LoadTranslations("basebans.phrases");
LoadTranslations("core.phrases"); LoadTranslations("core.phrases");
@ -106,14 +96,7 @@ public OnPluginEnd()
public OnMapStart() public OnMapStart()
{ {
//(Re-)Load BanReasons //(Re-)Load BanReasons
if(g_hKvBanReasons != INVALID_HANDLE) LoadBanReasons();
{
CloseHandle(g_hKvBanReasons);
}
if(!LoadBanReasons())
{
SetFailState("Error trying to load or parse %s: See logfile for details", g_BanReasonsPath);
}
} }
public OnClientDisconnect(client) public OnClientDisconnect(client)
@ -121,32 +104,32 @@ public OnClientDisconnect(client)
g_IsWaitingForChatReason[client] = false; g_IsWaitingForChatReason[client] = false;
} }
public bool:LoadBanReasons() LoadBanReasons()
{ {
if (g_hKvBanReasons != INVALID_HANDLE)
{
CloseHandle(g_hKvBanReasons);
}
g_hKvBanReasons = CreateKeyValues("banreasons"); g_hKvBanReasons = CreateKeyValues("banreasons");
if(FileToKeyValues(g_hKvBanReasons, g_BanReasonsPath)) if(FileToKeyValues(g_hKvBanReasons, g_BanReasonsPath))
{ {
decl String:sectionName[255]; decl String:sectionName[255];
if(!KvGetSectionName(g_hKvBanReasons, sectionName, sizeof(sectionName))) if(!KvGetSectionName(g_hKvBanReasons, sectionName, sizeof(sectionName)))
{ {
LogMessage("Error in %s: File corrupt or in the wrong format", g_BanReasonsPath); return SetFailState("Error in %s: File corrupt or in the wrong format", g_BanReasonsPath);
return false;
} }
if(strcmp(sectionName, "banreasons") != 0) if(strcmp(sectionName, "banreasons") != 0)
{ {
LogMessage("Error in %s: Couldn't find 'banreasons'", g_BanReasonsPath); return SetFailState("Error in %s: Couldn't find 'banreasons'", g_BanReasonsPath);
return false;
} }
//Reset kvHandle //Reset kvHandle
KvRewind(g_hKvBanReasons); KvRewind(g_hKvBanReasons);
} else {
return true; return SetFailState("Error in %s: File not found, corrupt or in the wrong format", g_BanReasonsPath);
}
else
{
LogMessage("Error in %s: File not found, corrupt or in the wrong format", g_BanReasonsPath);
return false;
} }
} }