diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-09-13 10:59:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-13 10:59:00 +0200 |
commit | 1a16dabfb52a5f3e82afa22ee827d8ed8f17511e (patch) | |
tree | d99eddbfc533a6ce37fde09d31f656ff31887dcb /core | |
parent | 9c0cc0db63f61cd71a2a735519dc7816973e5b7e (diff) | |
parent | 08bde5b2dea65ef3f80af5de4f4caf0e76982b64 (diff) |
Merge pull request #21982 from luzpaz/misc-typos
Misc. typos
Diffstat (limited to 'core')
-rw-r--r-- | core/io/http_client.cpp | 2 | ||||
-rw-r--r-- | core/math/octree.h | 2 | ||||
-rw-r--r-- | core/math/triangulate.cpp | 2 | ||||
-rw-r--r-- | core/os/dir_access.h | 2 | ||||
-rw-r--r-- | core/os/os.h | 2 | ||||
-rw-r--r-- | core/project_settings.cpp | 2 | ||||
-rw-r--r-- | core/variant_parser.cpp | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index c47ae05dc2..f241be890c 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -349,7 +349,7 @@ Error HTTPClient::poll() { } if (ssl->get_status() == StreamPeerSSL::STATUS_CONNECTED) { - // Handshake has been successfull + // Handshake has been successful handshaking = false; status = STATUS_CONNECTED; return OK; diff --git a/core/math/octree.h b/core/math/octree.h index b57fb84e8f..cd89743a5a 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -478,7 +478,7 @@ void Octree<T, use_pairs, AL>::_insert_element(Element *p_element, Octant *p_oct splits++; } } else { - /* check againt AABB where child should be */ + /* check against AABB where child should be */ AABB aabb = p_octant->aabb; aabb.size *= 0.5; diff --git a/core/math/triangulate.cpp b/core/math/triangulate.cpp index 0edc0ea039..69ffc95946 100644 --- a/core/math/triangulate.cpp +++ b/core/math/triangulate.cpp @@ -186,7 +186,7 @@ bool Triangulate::triangulate(const Vector<Vector2> &contour, Vector<int> &resul nv--; - /* resest error detection counter */ + /* reset error detection counter */ count = 2 * nv; } } diff --git a/core/os/dir_access.h b/core/os/dir_access.h index 6b391a87fa..773f0bcd41 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -38,7 +38,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ -//@ TOOD, excellent candidate for THREAD_SAFE MACRO, should go through all these and add THREAD_SAFE where it applies +//@ TODO, excellent candidate for THREAD_SAFE MACRO, should go through all these and add THREAD_SAFE where it applies class DirAccess { public: enum AccessType { diff --git a/core/os/os.h b/core/os/os.h index 8fb5b45f67..7786ffb26e 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -129,7 +129,7 @@ protected: RenderThreadMode _render_thread_mode; - // functions used by main to initialize/deintialize the OS + // functions used by main to initialize/deinitialize the OS void add_logger(Logger *p_logger); virtual void initialize_core() = 0; diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 04e09fb12e..99a23bbee1 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -60,7 +60,7 @@ String ProjectSettings::get_resource_path() const { String ProjectSettings::localize_path(const String &p_path) const { if (resource_path == "") - return p_path; //not initialied yet + return p_path; //not initialized yet if (p_path.begins_with("res://") || p_path.begins_with("user://") || (p_path.is_abs_path() && !p_path.begins_with(resource_path))) diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 2c45c6b3ed..3d5ae74e92 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -1429,10 +1429,10 @@ Error VariantParser::_parse_tag(Token &token, Stream *p_stream, int &line, Strin break; if (parsing_tag && token.type == TK_PERIOD) { - r_tag.name += "."; //support tags such as [someprop.Anroid] for specific platforms + r_tag.name += "."; //support tags such as [someprop.Android] for specific platforms get_token(p_stream, token, line, r_err_str); } else if (parsing_tag && token.type == TK_COLON) { - r_tag.name += ":"; //support tags such as [someprop.Anroid] for specific platforms + r_tag.name += ":"; //support tags such as [someprop.Android] for specific platforms get_token(p_stream, token, line, r_err_str); } else { parsing_tag = false; |