diff options
| author | Rémi Verschelde | 2017-12-05 21:14:29 +0100 |
|---|---|---|
| committer | GitHub | 2017-12-05 21:14:29 +0100 |
| commit | 9a96a2a06e2daacdcd90469c33e8f5f6dafa6958 (patch) | |
| tree | 4069a4c5cee9ec31f9d2f5e888b2c31479921e73 /modules | |
| parent | 1587f45c2551a43db2808f2c5938095e19f060d2 (diff) | |
| parent | fd1b94e307fadcb5a28d067e2bfac90fb8d55328 (diff) | |
| download | godot-9a96a2a06e2daacdcd90469c33e8f5f6dafa6958.tar.gz godot-9a96a2a06e2daacdcd90469c33e8f5f6dafa6958.tar.zst godot-9a96a2a06e2daacdcd90469c33e8f5f6dafa6958.zip | |
Merge pull request #14000 from mhilbrunner/issue-13950
Improve slang, especially in user-visible parts. Closes #13950.
Diffstat (limited to '')
| -rw-r--r-- | modules/gdnative/include/gdnative/gdnative.h | 2 | ||||
| -rw-r--r-- | modules/mono/glue/cs_files/Error.cs | 3 | ||||
| -rw-r--r-- | modules/opus/audio_stream_opus.cpp | 2 | ||||
| -rw-r--r-- | modules/squish/image_compress_squish.cpp | 2 | ||||
| -rw-r--r-- | modules/vorbis/audio_stream_ogg_vorbis.cpp | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index 6e69d4346..f7f560642 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -115,8 +115,6 @@ typedef enum { GODOT_ERR_HELP, ///< user requested help!! GODOT_ERR_BUG, ///< a bug in the software certainly happened, due to a double check failing or unexpected behavior. GODOT_ERR_PRINTER_ON_FIRE, /// the parallel port printer is engulfed in flames - GODOT_ERR_OMFG_THIS_IS_VERY_VERY_BAD, ///< shit happens, has never been used, though - GODOT_ERR_WTF = GODOT_ERR_OMFG_THIS_IS_VERY_VERY_BAD ///< short version of the above } godot_error; ////// bool diff --git a/modules/mono/glue/cs_files/Error.cs b/modules/mono/glue/cs_files/Error.cs index 3f4a92603..dee4b88f7 100644 --- a/modules/mono/glue/cs_files/Error.cs +++ b/modules/mono/glue/cs_files/Error.cs @@ -42,7 +42,6 @@ namespace Godot ERR_CYCLIC_LINK = 40, ERR_BUSY = 44, ERR_HELP = 46, - ERR_BUG = 47, - ERR_WTF = 49 + ERR_BUG = 47 } } diff --git a/modules/opus/audio_stream_opus.cpp b/modules/opus/audio_stream_opus.cpp index 06eab4c94..5742102da 100644 --- a/modules/opus/audio_stream_opus.cpp +++ b/modules/opus/audio_stream_opus.cpp @@ -62,7 +62,7 @@ int AudioStreamPlaybackOpus::_op_seek_func(void *_stream, opus_int64 _offset, in fa->seek_end(_offset); } break; default: { - ERR_PRINT("BUG, wtf was whence set to?\n"); + ERR_PRINT("Opus seek function failure: Unexpected value in _whence\n"); } } int ret = fa->eof_reached() ? -1 : 0; diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index 072f18b99..ac436c3c2 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -64,7 +64,7 @@ void image_decompress_squish(Image *p_image) { } else if (p_image->get_format() == Image::FORMAT_RGTC_RG) { squish_flags = squish::kBc5; } else { - print_line("wtf askd to decompress.. " + itos(p_image->get_format())); + print_line("Can't decompress unknown format: " + itos(p_image->get_format())); ERR_FAIL_COND(true); return; } diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index 9fb6fa819..03c0bfb1c 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -64,7 +64,7 @@ int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f, ogg_int64_t offs, int fa->seek_end(offs); } else { - ERR_PRINT("BUG, wtf was whence set to?\n"); + ERR_PRINT("Vorbis seek function failure: Unexpected value in _whence\n"); } int ret = fa->eof_reached() ? -1 : 0; //printf("returning %i\n",ret); |