Skip to content
Permalink
Browse files

Fix integer-string conversion for shaders

closes #10605
  • Loading branch information
sfan5 committed Nov 5, 2020
1 parent 3356da0 commit 627c22c36e32185d48d2faf8197e22cbaa4c50b2
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/client/shader.cpp
@@ -734,7 +734,7 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
shaders_header += "#define ";
shaders_header += drawTypes[i];
shaders_header += " ";
shaders_header += std::to_string(i);
shaders_header += itos(i);
shaders_header += "\n";
}

@@ -757,15 +757,15 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
shaders_header += "#define ";
shaders_header += materialTypes[i];
shaders_header += " ";
shaders_header += std::to_string(i);
shaders_header += itos(i);
shaders_header += "\n";
}

shaders_header += "#define MATERIAL_TYPE ";
shaders_header += std::to_string(material_type);
shaders_header += itos(material_type);
shaders_header += "\n";
shaders_header += "#define DRAW_TYPE ";
shaders_header += std::to_string(drawtype);
shaders_header += itos(drawtype);
shaders_header += "\n";

if (g_settings->getBool("enable_waving_water")){

3 comments on commit 627c22c

@numberZero

This comment has been minimized.

Copy link
Contributor

@numberZero numberZero replied Nov 5, 2020

@sfan5 What was the problem here? is material_type a enum instead of integer?

@numberZero

This comment has been minimized.

Copy link
Contributor

@numberZero numberZero replied Nov 5, 2020

whoops, read that again... MSVC seems to think u8 is the same as char...

@numberZero

This comment has been minimized.

Copy link
Contributor

@numberZero numberZero replied Nov 5, 2020

so why not to simply change argument types to int, for example?

Please sign in to comment.
You can’t perform that action at this time.