Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #57562 from AnilBK/string-add-contains

Browse source 
String: Add contains().
This commit is contained in:
Rémi Verschelde 2022-02-03 22:21:24 +01:00 • committed by GitHub
commit f8f19b313d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 142 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servers/rendering/rendering_device_binds.cpp
View file

@ -99,11 +99,11 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String
if (reading_versions) {
String l = line.strip_edges();
if (!l.is_empty()) {
if (l.find("=") == -1) {
if (!l.contains("=")) {
base_error = "Missing `=` in '" + l + "'. Version syntax is `version = \"<defines with C escaping>\";`.";
break;
}
if (l.find(";") == -1) {
if (!l.contains(";")) {
// We don't require a semicolon per se, but it's needed for clang-format to handle things properly.
base_error = "Missing `;` in '" + l + "'. Version syntax is `version = \"<defines with C escaping>\";`.";
break;

2
servers/rendering/shader_compiler.cpp
View file

@ -182,7 +182,7 @@ static String _mkid(const String &p_id) {
static String f2sp0(float p_float) {
String num = rtoss(p_float);
if (num.find(".") == -1 && num.find("e") == -1) {
if (!num.contains(".") && !num.contains("e")) {
num += ".0";
}
return num;