godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11485 from rosshadden/fix/typos

Browse Source 
Fixed a bunch of typos, including an error code.

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-22 09:00:01 +02:00 committed by GitHub
commit 9906aeb2f8
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/array.cpp
View File

@ -47,11 +47,11 @@ void Array::_ref(const Array &p_from) const {
ERR_FAIL_COND(!_fp); // should NOT happen. ERR_FAIL_COND(!_fp); // should NOT happen.
if (_fp == _p) if (_fp == _p)
return; //wathever it is, nothing to do here move along return; // whatever it is, nothing to do here move along
bool success = _fp->refcount.ref(); bool success = _fp->refcount.ref();
ERR_FAIL_COND(!success); //should really not happen either ERR_FAIL_COND(!success); // should really not happen either
_unref(); _unref();

2
core/error_list.h
View File

@ -66,7 +66,7 @@ enum Error {
ERR_CANT_CONNECT, // (25) ERR_CANT_CONNECT, // (25)
ERR_CANT_RESOLVE, ERR_CANT_RESOLVE,
ERR_CONNECTION_ERROR, ERR_CONNECTION_ERROR,
ERR_CANT_AQUIRE_RESOURCE, ERR_CANT_ACQUIRE_RESOURCE,
ERR_CANT_FORK, ERR_CANT_FORK,
ERR_INVALID_DATA, ///< Data passed is invalid (30) ERR_INVALID_DATA, ///< Data passed is invalid (30)
ERR_INVALID_PARAMETER, ///< Parameter passed is invalid ERR_INVALID_PARAMETER, ///< Parameter passed is invalid

2
core/global_constants.cpp
View File

@ -472,7 +472,7 @@ void register_global_constants() {
BIND_GLOBAL_ENUM_CONSTANT(ERR_ALREADY_IN_USE); BIND_GLOBAL_ENUM_CONSTANT(ERR_ALREADY_IN_USE);
BIND_GLOBAL_ENUM_CONSTANT(ERR_LOCKED); ///< resource is locked BIND_GLOBAL_ENUM_CONSTANT(ERR_LOCKED); ///< resource is locked
BIND_GLOBAL_ENUM_CONSTANT(ERR_TIMEOUT); BIND_GLOBAL_ENUM_CONSTANT(ERR_TIMEOUT);
BIND_GLOBAL_ENUM_CONSTANT(ERR_CANT_AQUIRE_RESOURCE); BIND_GLOBAL_ENUM_CONSTANT(ERR_CANT_ACQUIRE_RESOURCE);
BIND_GLOBAL_ENUM_CONSTANT(ERR_INVALID_DATA); ///< Data passed is invalid BIND_GLOBAL_ENUM_CONSTANT(ERR_INVALID_DATA); ///< Data passed is invalid
BIND_GLOBAL_ENUM_CONSTANT(ERR_INVALID_PARAMETER); ///< Parameter passed is invalid BIND_GLOBAL_ENUM_CONSTANT(ERR_INVALID_PARAMETER); ///< Parameter passed is invalid
BIND_GLOBAL_ENUM_CONSTANT(ERR_ALREADY_EXISTS); ///< When adding ), item already exists BIND_GLOBAL_ENUM_CONSTANT(ERR_ALREADY_EXISTS); ///< When adding ), item already exists

6
core/image.cpp
View File

@ -530,7 +530,7 @@ static void _scale_cubic(const uint8_t *p_src, uint8_t *p_dst, uint32_t p_src_wi
int height = p_src_height; int height = p_src_height;
double xfac = (double)width / p_dst_width; double xfac = (double)width / p_dst_width;
double yfac = (double)height / p_dst_height; double yfac = (double)height / p_dst_height;
// coordinates of source points and cooefficiens // coordinates of source points and coefficients
double ox, oy, dx, dy, k1, k2; double ox, oy, dx, dy, k1, k2;
int ox1, oy1, ox2, oy2; int ox1, oy1, ox2, oy2;
// destination pixel values // destination pixel values
@ -561,7 +561,7 @@ static void _scale_cubic(const uint8_t *p_src, uint8_t *p_dst, uint32_t p_src_wi
} }
for (int n = -1; n < 3; n++) { for (int n = -1; n < 3; n++) {
// get Y cooefficient // get Y coefficient
k1 = _bicubic_interp_kernel(dy - (double)n); k1 = _bicubic_interp_kernel(dy - (double)n);
oy2 = oy1 + n; oy2 = oy1 + n;
@ -571,7 +571,7 @@ static void _scale_cubic(const uint8_t *p_src, uint8_t *p_dst, uint32_t p_src_wi
oy2 = ymax; oy2 = ymax;
for (int m = -1; m < 3; m++) { for (int m = -1; m < 3; m++) {
// get X cooefficient // get X coefficient
k2 = k1 * _bicubic_interp_kernel((double)m - dx); k2 = k1 * _bicubic_interp_kernel((double)m - dx);
ox2 = ox1 + m; ox2 = ox1 + m;

2
core/object.cpp
View File

@ -1052,7 +1052,7 @@ Variant Object::_emit_signal(const Variant **p_args, int p_argcount, Variant::Ca
Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int p_argcount) { Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int p_argcount) {
if (_block_signals) if (_block_signals)
return ERR_CANT_AQUIRE_RESOURCE; //no emit, signals blocked return ERR_CANT_ACQUIRE_RESOURCE; //no emit, signals blocked
Signal *s = signal_map.getptr(p_name); Signal *s = signal_map.getptr(p_name);
if (!s) { if (!s) {

6
core/object.h
View File

@ -64,9 +64,9 @@ enum PropertyHint {
PROPERTY_HINT_LAYERS_3D_RENDER, PROPERTY_HINT_LAYERS_3D_RENDER,
PROPERTY_HINT_LAYERS_3D_PHYSICS, PROPERTY_HINT_LAYERS_3D_PHYSICS,
PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc," PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
PROPERTY_HINT_DIR, ///< a directort path must be passed PROPERTY_HINT_DIR, ///< a directory path must be passed
PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc," PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
PROPERTY_HINT_GLOBAL_DIR, ///< a directort path must be passed PROPERTY_HINT_GLOBAL_DIR, ///< a directory path must be passed
PROPERTY_HINT_RESOURCE_TYPE, ///< a resource object type PROPERTY_HINT_RESOURCE_TYPE, ///< a resource object type
PROPERTY_HINT_MULTILINE_TEXT, ///< used for string properties that can contain multiple lines PROPERTY_HINT_MULTILINE_TEXT, ///< used for string properties that can contain multiple lines
PROPERTY_HINT_COLOR_NO_ALPHA, ///< used for ignoring alpha component when editing a color PROPERTY_HINT_COLOR_NO_ALPHA, ///< used for ignoring alpha component when editing a color
@ -221,7 +221,7 @@ struct MethodInfo {
//return NULL; //return NULL;
/* /*
the following is an uncomprehensible blob of hacks and workarounds to compensate for many of the fallencies in C++. As a plus, this macro pretty much alone defines the object model. the following is an incomprehensible blob of hacks and workarounds to compensate for many of the fallencies in C++. As a plus, this macro pretty much alone defines the object model.
*/ */
#define REVERSE_GET_PROPERTY_LIST \ #define REVERSE_GET_PROPERTY_LIST \

12
core/ustring.cpp
View File

@ -1755,7 +1755,7 @@ static double built_in_strtod(const C *string, /* A decimal ASCII floating-point
register int c; register int c;
int exp = 0; /* Exponent read from "EX" field. */ int exp = 0; /* Exponent read from "EX" field. */
int fracExp = 0; /* Exponent that derives from the fractional int fracExp = 0; /* Exponent that derives from the fractional
* part. Under normal circumstatnces, it is * part. Under normal circumstances, it is
* the negative of the number of digits in F. * the negative of the number of digits in F.
* However, if I is very long, the last digits * However, if I is very long, the last digits
* of I get dropped (otherwise a long I with a * of I get dropped (otherwise a long I with a
@ -2332,12 +2332,12 @@ int String::findn(String p_str, int p_from) const {
int String::rfind(String p_str, int p_from) const { int String::rfind(String p_str, int p_from) const {
//stabilish a limit // establish a limit
int limit = length() - p_str.length(); int limit = length() - p_str.length();
if (limit < 0) if (limit < 0)
return -1; return -1;
//stabilish a starting point // establish a starting point
if (p_from < 0) if (p_from < 0)
p_from = limit; p_from = limit;
else if (p_from > limit) else if (p_from > limit)
@ -2347,7 +2347,7 @@ int String::rfind(String p_str, int p_from) const {
int len = length(); int len = length();
if (src_len == 0 || len == 0) if (src_len == 0 || len == 0)
return -1; //wont find anything! return -1; // won't find anything!
const CharType *src = c_str(); const CharType *src = c_str();
@ -2378,12 +2378,12 @@ int String::rfind(String p_str, int p_from) const {
} }
int String::rfindn(String p_str, int p_from) const { int String::rfindn(String p_str, int p_from) const {
//stabilish a limit // establish a limit
int limit = length() - p_str.length(); int limit = length() - p_str.length();
if (limit < 0) if (limit < 0)
return -1; return -1;
//stabilish a starting point // establish a starting point
if (p_from < 0) if (p_from < 0)
p_from = limit; p_from = limit;
else if (p_from > limit) else if (p_from > limit)

2
doc/classes/@Global Scope.xml
View File

@ -1013,7 +1013,7 @@
</constant> </constant>
<constant name="ERR_TIMEOUT" value="24"> <constant name="ERR_TIMEOUT" value="24">
</constant> </constant>
<constant name="ERR_CANT_AQUIRE_RESOURCE" value="28"> <constant name="ERR_CANT_ACQUIRE_RESOURCE" value="28">
</constant> </constant>
<constant name="ERR_INVALID_DATA" value="30"> <constant name="ERR_INVALID_DATA" value="30">
</constant> </constant>

2
modules/gdnative/include/gdnative/gdnative.h
View File

@ -103,7 +103,7 @@ typedef enum {
GODOT_ERR_CANT_CONNECT, // (25) GODOT_ERR_CANT_CONNECT, // (25)
GODOT_ERR_CANT_RESOLVE, GODOT_ERR_CANT_RESOLVE,
GODOT_ERR_CONNECTION_ERROR, GODOT_ERR_CONNECTION_ERROR,
GODOT_ERR_CANT_AQUIRE_RESOURCE, GODOT_ERR_CANT_ACQUIRE_RESOURCE,
GODOT_ERR_CANT_FORK, GODOT_ERR_CANT_FORK,
GODOT_ERR_INVALID_DATA, ///< Data passed is invalid (30) GODOT_ERR_INVALID_DATA, ///< Data passed is invalid (30)
GODOT_ERR_INVALID_PARAMETER, ///< Parameter passed is invalid GODOT_ERR_INVALID_PARAMETER, ///< Parameter passed is invalid