Skip to content
This repository has been archived by the owner on Sep 4, 2022. It is now read-only.

Commit

Permalink
Prep SourceMod 1.11
Browse files Browse the repository at this point in the history 
Different method from Naydef to try to preserve the fact that plugins aren't loaded in pre-round or when FF2 is disabled by only renaming them to .smx for the duration they are loaded.

See 50DKP/FF2-Official@3bd8c04 for more details on FF2-Official's commit and alliedmodders/sourcemod#1437 about plugin ext changes.
  • Loading branch information
@Batfoxkid
Batfoxkid committed Mar 9, 2021
1 parent 83e3284 commit 072b573
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 28 deletions.
50 changes: 23 additions & 27 deletions addons/sourcemod/scripting/freak_fortress_2.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ last time or to encourage others to do the same.
*/
#define FORK_MAJOR_REVISION "1"
#define FORK_MINOR_REVISION "20"
#define FORK_STABLE_REVISION "4"
#define FORK_STABLE_REVISION "5"
#define FORK_SUB_REVISION "Unofficial"
//#define FORK_DEV_REVISION "development"
#define FORK_DATE_REVISION "February 7, 2021"
#define FORK_DATE_REVISION "March 8, 2021"

#if defined FORK_DEV_REVISION
#define PLUGIN_VERSION FORK_SUB_REVISION..." "...FORK_MAJOR_REVISION..."."...FORK_MINOR_REVISION..."."...FORK_STABLE_REVISION..." "...FORK_DEV_REVISION
Expand Down Expand Up @@ -828,7 +828,7 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
{
char plugin[PLATFORM_MAX_PATH];
GetPluginFilename(myself, plugin, sizeof(plugin));
if(!StrContains(plugin, "freaks/")) //Prevent plugins/freaks/freak_fortress_2.ff2 from loading if it exists -.-
if(!StrContains(plugin, "freaks/")) //Prevent plugins/freaks/freak_fortress_2 from loading if it exists -.-
{
strcopy(error, err_max, "There is a duplicate copy of Freak Fortress 2 inside the /plugins/freaks folder. Please remove it");
return APLRes_Failure;
Expand Down Expand Up @@ -2683,21 +2683,15 @@ void EnableSubPlugins(bool force=false)
Handle directory = OpenDirectory(path);
while(ReadDirEntry(directory, filename, sizeof(filename), filetype))
{
if(filetype==FileType_File && StrContains(filename, ".smx", false)!=-1)
if(filetype==FileType_File && StrContains(filename, ".ff2", false)!=-1)
{
FormatEx(filename_old, sizeof(filename_old), "%s/%s", path, filename);
ReplaceString(filename, sizeof(filename), ".smx", ".ff2", false);
ReplaceString(filename, sizeof(filename), ".ff2", ".smx", false);
Format(filename, sizeof(filename), "%s/%s", path, filename);
DeleteFile(filename); // Just in case filename.ff2 also exists: delete it and replace it with the new .smx version
DeleteFile(filename); // Just in case filename.smx also exists: delete it and replace it with the new .smx version
RenameFile(filename, filename_old);
}
}

directory = OpenDirectory(path);
while(ReadDirEntry(directory, filename, sizeof(filename), filetype))
{
if(filetype==FileType_File && StrContains(filename, ".ff2", false)!=-1)
ServerCommand("sm plugins load freaks/%s", filename);
}
}
}

Expand All @@ -2712,8 +2706,13 @@ void DisableSubPlugins(bool force=false)
Handle directory = OpenDirectory(path);
while(ReadDirEntry(directory, filename, sizeof(filename), filetype))
{
if(filetype==FileType_File && StrContains(filename, ".ff2", false)!=-1)
InsertServerCommand("sm plugins unload freaks/%s", filename); //ServerCommand will not work when switching maps
if(filetype==FileType_File && StrContains(filename, ".smx", false)!=-1)
{
InsertServerCommand("sm plugins unload freaks/%s", filename); // ServerCommand will not work when switching maps

Format(filename, sizeof(filename), "%s/%s", path, filename);
DeleteFile(filename); // Remove smx so we don't load it in automatically
}
}
ServerExecute();
areSubPluginsEnabled = false;
Expand Down Expand Up @@ -2873,7 +2872,7 @@ public void LoadCharacter(const char[] character)
{
static char plugin_name[64];
KvGetString(BossKV[Specials], "plugin_name", plugin_name, 64);
BuildPath(Path_SM, config, sizeof(config), "plugins/freaks/%s.ff2", plugin_name);
BuildPath(Path_SM, config, sizeof(config), "plugins/freaks/%s.smx", plugin_name);
if(!FileExists(config))
{
LogToFile(eLog, "[Boss] Character %s needs plugin %s!", character, plugin_name);
Expand Down Expand Up @@ -4076,7 +4075,6 @@ public void OnRoundStart(Event event, const char[] name, bool dontBroadcast)

void LoadDifficulty(int boss)
{
char plugin[68];
KvRewind(kvDiffMods);
KvGotoFirstSubKey(kvDiffMods);
do
Expand All @@ -4086,6 +4084,7 @@ void LoadDifficulty(int boss)
if(!StrEqual(section, dIncoming[Boss[boss]]))
continue;

static char plugin[80];
KvRewind(BossKV[Special[boss]]);
KvGetString(BossKV[Special[boss]], "filename", plugin, sizeof(plugin));
if(!KvGetNum(kvDiffMods, plugin, KvGetNum(kvDiffMods, "default", 1)))
Expand All @@ -4095,9 +4094,8 @@ void LoadDifficulty(int boss)
KvGotoFirstSubKey(kvDiffMods);
do
{
static char buffer[PLATFORM_MAX_PATH];
KvGetSectionName(kvDiffMods, buffer, sizeof(buffer));
FormatEx(plugin, sizeof(plugin), "%s.ff2", buffer);
static char buffer[80];
KvGetSectionName(kvDiffMods, plugin, sizeof(plugin));
Handle iter = GetPluginIterator();
Handle pl = INVALID_HANDLE;
while(MorePlugins(iter))
Expand Down Expand Up @@ -10032,18 +10030,16 @@ public Action Command_ReloadSubPlugins(int client, int args)
return Plugin_Handled;
}

static char pluginName[PLATFORM_MAX_PATH];
static char pluginName[80], filepath[PLATFORM_MAX_PATH];
GetCmdArg(1, pluginName, sizeof(pluginName));
BuildPath(Path_SM, pluginName, sizeof(pluginName), "plugins/freaks/%s.ff2", pluginName);
if(!FileExists(pluginName))
BuildPath(Path_SM, filepath, sizeof(filepath), "plugins/freaks/%s.smx", pluginName);
if(!FileExists(filepath))
{
FReplyToCommand(client, "Subplugin %s does not exist!", pluginName);
return Plugin_Handled;
}
ReplaceString(pluginName, sizeof(pluginName), "addons/sourcemod/plugins/freaks/", "freaks/", false);
ServerCommand("sm plugins unload %s", pluginName);
ServerCommand("sm plugins load %s", pluginName);
ReplaceString(pluginName, sizeof(pluginName), "freaks/", " ", false);
ServerCommand("sm plugins unload freaks/%s", pluginName);
ServerCommand("sm plugins load freaks/%s", pluginName);
FReplyToCommand(client, "Reloaded subplugin %s!", pluginName);
return Plugin_Handled;
}
Expand Down
2 changes: 1 addition & 1 deletion addons/sourcemod/scripting/include/freak_fortress_2_subplugin.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ void GetThisPluginName()
{
char pluginName[80];
GetPluginFilename(INVALID_HANDLE, pluginName, sizeof(pluginName));
ReplaceString(pluginName, sizeof(pluginName), ".ff2", "", false);
ReplaceString(pluginName, sizeof(pluginName), ".ff2", "", false); // Remove when 1.11 is stable
int forwardSlash = -1;
int backwardSlash = -1;
int finalPluginName = -1;
Expand Down

0 comments on commit 072b573

Please sign in to comment.