Merge pull request godotengine#82779 from emacser0/typo

Fix some typos in source
marcinn · Oct 4, 2023 · bfd78bb · bfd78bb
2 parents e8e79c9 + 4c65ff5
commit bfd78bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/editor/project_converter_3_to_4.cpp b/editor/project_converter_3_to_4.cpp
@@ -113,7 +113,7 @@ class ProjectConverter3To4::RegExContainer {
 	// GDScript keywords.
 	RegEx keyword_gdscript_tool = RegEx("^tool");
 	RegEx keyword_gdscript_export_single = RegEx("^export");
-	RegEx keyword_gdscript_export_mutli = RegEx("([\t]+)export\\b");
+	RegEx keyword_gdscript_export_multi = RegEx("([\t]+)export\\b");
 	RegEx keyword_gdscript_onready = RegEx("^onready");
 	RegEx keyword_gdscript_remote = RegEx("^remote func");
 	RegEx keyword_gdscript_remotesync = RegEx("^remotesync func");
@@ -2548,7 +2548,7 @@ void ProjectConverter3To4::rename_gdscript_keywords(Vector<SourceLine> &source_l
 				line = reg_container.keyword_gdscript_export_single.sub(line, "@export", true);
 			}
 			if (line.contains("export")) {
-				line = reg_container.keyword_gdscript_export_mutli.sub(line, "$1@export", true);
+				line = reg_container.keyword_gdscript_export_multi.sub(line, "$1@export", true);
 			}
 			if (line.contains("onready")) {
 				line = reg_container.keyword_gdscript_onready.sub(line, "@onready", true);
@@ -2607,7 +2607,7 @@ Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<S
 
 			if (line.contains("export")) {
 				old = line;
-				line = reg_container.keyword_gdscript_export_mutli.sub(line, "@export", true);
+				line = reg_container.keyword_gdscript_export_multi.sub(line, "@export", true);
 				if (old != line) {
 					found_renames.append(line_formatter(current_line, "export", "@export", line));
 				}

diff --git a/modules/bmp/image_loader_bmp.cpp b/modules/bmp/image_loader_bmp.cpp
@@ -167,7 +167,7 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 
 						// Next we apply some color scaling going from a variable value space to a 256 value space.
 						// This may be simplified some but left as is for legibility.
-						// float scaled_value = unscaled_value * byte_max_value / color_channel_maxium_value + rounding_offset;
+						// float scaled_value = unscaled_value * byte_max_value / color_channel_maximum_value + rounding_offset;
 						float f0 = b0 * 255.0f / static_cast<float>(p_header.bmp_bitfield.red_max) + 0.5f;
 						float f1 = b1 * 255.0f / static_cast<float>(p_header.bmp_bitfield.green_max) + 0.5f;
 						float f2 = b2 * 255.0f / static_cast<float>(p_header.bmp_bitfield.blue_max) + 0.5f;

diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
@@ -60,10 +60,10 @@ String _remove_symlink(const String &dir) {
 	// Change directory to the external data directory.
 	chdir(dir.utf8().get_data());
 	// Get the actual directory without the potential symlink.
-	char dir_name_wihout_symlink[2048];
-	getcwd(dir_name_wihout_symlink, 2048);
+	char dir_name_without_symlink[2048];
+	getcwd(dir_name_without_symlink, 2048);
 	// Convert back to a String.
-	String dir_without_symlink(dir_name_wihout_symlink);
+	String dir_without_symlink(dir_name_without_symlink);
 	// Restore original current directory.
 	chdir(current_dir_name);
 	return dir_without_symlink;