natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'noggit-shadowlands' of https://gitlab.com/prophecy-rp/noggit-red into noggit-shadowlands

Browse Source
This commit is contained in:
Alister
2021-12-26 14:57:54 +00:00
parent 13ec5ecaf3 07807ad557
commit 951e2ae9da
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/noggit/LiquidTextureManager.cpp
View File

@@ -28,7 +28,7 @@ void LiquidTextureManager::upload()
// procedural water hack fix
if (shader_type == 3)
{
filename = "XTextures\\river\\lake_a.%d.blp";
filename = "XTextures\\river\\lake_a.";
// default param for water
anim = glm::vec2(1.f, 0.f);
}
@@ -38,7 +38,8 @@ void LiquidTextureManager::upload()
// TODO: why even try-catching there? empty string? BARE_EXCEPT_INV
try
{
filename = record.getString(LiquidTypeDB::TextureFilenames);
std::string db_string_template = record.getString(LiquidTypeDB::TextureFilenames);
filename = db_string_template.substr(0, db_string_template.length() - 6);
}
catch (...) // fallback for malformed DBC
{