diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/areastore.cpp | 2 | ||||
| -rw-r--r-- | src/util/container.h | 4 | ||||
| -rw-r--r-- | src/util/numeric.cpp | 4 | ||||
| -rw-r--r-- | src/util/sha2.h | 6 | ||||
| -rw-r--r-- | src/util/strfnd.h | 2 | ||||
| -rw-r--r-- | src/util/string.h | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp index bf751476f..053460d68 100644 --- a/src/util/areastore.cpp +++ b/src/util/areastore.cpp @@ -69,7 +69,7 @@ void AreaStore::serialize(std::ostream &os) const // After 5.1.0-dev: version >= 5 throws SerializationError // Forwards-compatibility is assumed before version 5. - writeU8(os, 0); // Serialisation version + writeU8(os, 0); // Serialization version // TODO: Compression? writeU16(os, areas_map.size()); diff --git a/src/util/container.h b/src/util/container.h index 001066563..b55777ff7 100644 --- a/src/util/container.h +++ b/src/util/container.h @@ -147,7 +147,7 @@ public: m_signal.post(); } - /* this version of pop_front returns a empty element of T on timeout. + /* this version of pop_front returns an empty element of T on timeout. * Make sure default constructor of T creates a recognizable "empty" element */ T pop_frontNoEx(u32 wait_time_max_ms) @@ -200,7 +200,7 @@ public: throw ItemNotFoundException("MutexedQueue: queue is empty"); } - /* this version of pop_back returns a empty element of T on timeout. + /* this version of pop_back returns an empty element of T on timeout. * Make sure default constructor of T creates a recognizable "empty" element */ T pop_backNoEx(u32 wait_time_max_ms) diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp index aa3bb843d..3bcac5335 100644 --- a/src/util/numeric.cpp +++ b/src/util/numeric.cpp @@ -147,7 +147,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, // Adjust camera position, for purposes of computing the angle, // such that a block that has any portion visible with the // current camera position will have the center visible at the - // adjusted postion + // adjusted position f32 adjdist = BLOCK_MAX_RADIUS / cos((M_PI - camera_fov) / 2); // Block position relative to adjusted camera @@ -161,7 +161,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, f32 cosangle = dforward / blockpos_adj.getLength(); // If block is not in the field of view, skip it - // HOTFIX: use sligthly increased angle (+10%) to fix too agressive + // HOTFIX: use sligthly increased angle (+10%) to fix too aggressive // culling. Somebody have to find out whats wrong with the math here. // Previous value: camera_fov / 2 if (cosangle < std::cos(camera_fov * 0.55f)) diff --git a/src/util/sha2.h b/src/util/sha2.h index 7d746262d..eb5c9f1e2 100644 --- a/src/util/sha2.h +++ b/src/util/sha2.h @@ -50,10 +50,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * The licence and distribution terms for any publically available version or + * The license and distribution terms for any publicly available version or * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] + * copied and put under another distribution license + * [including the GNU Public License.] */ #pragma once diff --git a/src/util/strfnd.h b/src/util/strfnd.h index 96cf1b458..4ba599437 100644 --- a/src/util/strfnd.h +++ b/src/util/strfnd.h @@ -48,7 +48,7 @@ public: return ret; } - // Returns substr up to the next occurence of sep that isn't escaped with esc ('\\') + // Returns substr up to the next occurrence of sep that isn't escaped with esc ('\\') String next_esc(const String &sep, T esc=static_cast<T>('\\')) { if (pos >= str.size()) diff --git a/src/util/string.h b/src/util/string.h index 83cce3765..80eea754c 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -450,7 +450,7 @@ inline void str_replace(std::string &str, const std::string &pattern, } /** - * Escapes characters [ ] \ , ; that can not be used in formspecs + * Escapes characters [ ] \ , ; that cannot be used in formspecs */ inline void str_formspec_escape(std::string &str) { @@ -729,7 +729,7 @@ inline std::string str_join(const std::vector<std::string> &list, } /** - * Create a UTF8 std::string from a irr::core::stringw. + * Create a UTF8 std::string from an irr::core::stringw. */ inline std::string stringw_to_utf8(const irr::core::stringw &input) { @@ -738,7 +738,7 @@ inline std::string stringw_to_utf8(const irr::core::stringw &input) } /** - * Create a irr::core:stringw from a UTF8 std::string. + * Create an irr::core:stringw from a UTF8 std::string. */ inline irr::core::stringw utf8_to_stringw(const std::string &input) { |