Skip to content

Commit 627c22c

Browse files
committedNov 5, 2020
Fix integer-string conversion for shaders
closes #10605
1 parent 3356da0 commit 627c22c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎src/client/shader.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
734734
shaders_header += "#define ";
735735
shaders_header += drawTypes[i];
736736
shaders_header += " ";
737-
shaders_header += std::to_string(i);
737+
shaders_header += itos(i);
738738
shaders_header += "\n";
739739
}
740740

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

764764
shaders_header += "#define MATERIAL_TYPE ";
765-
shaders_header += std::to_string(material_type);
765+
shaders_header += itos(material_type);
766766
shaders_header += "\n";
767767
shaders_header += "#define DRAW_TYPE ";
768-
shaders_header += std::to_string(drawtype);
768+
shaders_header += itos(drawtype);
769769
shaders_header += "\n";
770770

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

3 commit comments

Comments
 (3)

numberZero commented on Nov 5, 2020

@numberZero
Contributor

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

numberZero commented on Nov 5, 2020

@numberZero
Contributor

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

numberZero commented on Nov 5, 2020

@numberZero
Contributor

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

Please sign in to comment.