Skip to content

Commit

Permalink
Remove the fix_liquid_out_of_bounds (#49)
Browse files Browse the repository at this point in the history
* Update bug_fixes.cpp

* Update bug_fixes.h

* Update mod_manager.cpp

* Update bug_fixes.cpp

* Update playlunky_settings.cpp
  • Loading branch information
Mr-Auto authored Jan 13, 2024
1 parent 2e5674a commit 2fcce08
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 17 deletions.
12 changes: 0 additions & 12 deletions source/playlunky/mod/bug_fixes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ SpelunkyScript* g_ExtraPipesScript{ nullptr };
using GetNeighbouringGridEntityOfSameType = uint32_t(Entity* thorns, float offset_x, float offset_y);
GetNeighbouringGridEntityOfSameType* g_GetNeighbouringGridEntityOfSameType{ nullptr };

bool g_OutOfBoundsLiquids{ false };

struct PackedResource
{
PackedResource(LPSTR resource, LPSTR resource_type)
Expand Down Expand Up @@ -276,18 +274,8 @@ bool BugFixesInit(const PlaylunkySettings& settings,
LogError("Could not fix pipes: {}", error);
}
}

g_OutOfBoundsLiquids = settings.GetBool("bug_fixes", "out_of_bounds_liquids", true);

return true;
}
void BugFixesUpdate()
{
if (g_OutOfBoundsLiquids)
{
Spelunky_UpdateLiquidOutOfBoundsBugfix();
}
}
void BugFixesCleanup()
{
DetourTransactionBegin();
Expand Down
1 change: 0 additions & 1 deletion source/playlunky/mod/bug_fixes.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ void BugFixesMount(VirtualFilesystem& vfs,
bool BugFixesInit(const PlaylunkySettings& settings,
const std::filesystem::path& db_folder,
const std::filesystem::path& original_data_folder);
void BugFixesUpdate();
void BugFixesCleanup();
3 changes: 0 additions & 3 deletions source/playlunky/mod/mod_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1006,9 +1006,6 @@ void ModManager::Update()
UpdateShaderHotReload(db_original_folder, "shaders.hlsl", mVfs);
}
}

BugFixesUpdate();

mScriptManager.Update();
}
void ModManager::Draw()
Expand Down
1 change: 0 additions & 1 deletion source/playlunky/playlunky_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ void PlaylunkySettings::WriteToFile(std::string settings_file) const
KnownSetting{ .Name{ "enable_luminance_scaling" }, .DefaultValue{ "true" }, .Comment{ "Scales luminance of customized images based on the color" } },
} },
KnownCategory{ { "bug_fixes" }, {
KnownSetting{ .Name{ "out_of_bounds_liquids" }, .DefaultValue{ "true" }, .Comment{ "Removes liquids that go out of bounds, otherwise the game would crash" } },
KnownSetting{ .Name{ "missing_thorns" }, .DefaultValue{ "true" }, .Comment{ "Adds textures for the missing jungle thorns configurations" } },
KnownSetting{ .Name{ "missing_pipes" }, .DefaultValue{ "false" }, .Comment{ "May cause issues in multiplayer. Adds textures for the missing sunken city pipes configurations and makes those pipes work, some requiring user input" } },
} },
Expand Down

0 comments on commit 2fcce08

Please sign in to comment.