Skip to content

Commit

Permalink
Reverting string array initialization to older format since one of my…
Browse files Browse the repository at this point in the history
… tools don't like the new fancy things -_-
  • Loading branch information
Nefaro committed Jan 30, 2025
1 parent c6da30d commit 3fda76c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions GnollModLoader/GnollModLoader/LuaManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -274,21 +274,21 @@ private Script loadAndGetScript(string modName, string scriptPath)
script.Options.DebugPrint = s => { LuaLogger.Log(modName, s); };
script.Globals["Color"] = UserData.CreateStatic<Color>();

((ScriptLoaderBase)script.Options.ScriptLoader).ModulePaths = [
((ScriptLoaderBase)script.Options.ScriptLoader).ModulePaths = new string[] {
Path.GetDirectoryName(scriptPath) + "\\?",
Path.GetDirectoryName(scriptPath) + "\\?.lua",
Path.GetDirectoryName(_luaSupportInitScript) + "\\?",
Path.GetDirectoryName(_luaSupportInitScript) + "\\?.lua"
];
};

// XXX: DEBUG lines for local testing; leaving them in for now
/*
((ScriptLoaderBase)script.Options.ScriptLoader).ModulePaths = [
((ScriptLoaderBase)script.Options.ScriptLoader).ModulePaths = new string[] {
Environment.GetEnvironmentVariable("GNOLL_WORKSPACE") + "\\Gnoll Mods\\ExpLuaIntegration\\ExpLuaIntegration\\Scripts\\?",
Environment.GetEnvironmentVariable("GNOLL_WORKSPACE") + "\\Gnoll Mods\\ExpLuaIntegration\\ExpLuaIntegration\\Scripts\\?.lua",
Environment.GetEnvironmentVariable("GNOLL_WORKSPACE") + "\\Gnoll Mods\\LuaSupport\\LuaSupport\\Scripts\\?",
Environment.GetEnvironmentVariable("GNOLL_WORKSPACE") + "\\Gnoll Mods\\LuaSupport\\LuaSupport\\Scripts\\?.lua"
];
};
*/

Logger.Log("Module paths: ");
Expand Down
2 changes: 1 addition & 1 deletion Installer/InstallerGUI/InstallerGUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<SuiteName>Gnoll</SuiteName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<DisallowUrlActivation>true</DisallowUrlActivation>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.14.2.%2a</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down
8 changes: 4 additions & 4 deletions patch/patchinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"patches": [
{
"version": 14,
"versionString":"1.14.2b",
"versionString":"1.14.2c",
"filename": "Gnoll1.1x_016e6239.xdelta"
}
],
"latestVersion":"1.14.2b"
"latestVersion":"1.14.2c"
},
{
"name": "v1.0 (Steam 2019)",
Expand All @@ -19,10 +19,10 @@
"patches": [
{
"version": 14,
"versionString":"1.14.2b",
"versionString":"1.14.2c",
"filename": "Gnoll1.1x_c9f6d4b9.xdelta"
}
],
"latestVersion":"1.14.2b"
"latestVersion":"1.14.2c"
}
]

0 comments on commit 3fda76c

Please sign in to comment.