Browse Source

Improve slang, especially in user-visible parts

Unknown 7 years ago
parent
commit
fd1b94e307

+ 0 - 2
core/error_list.h

@@ -87,8 +87,6 @@ enum Error {
 	ERR_HELP, ///< user requested help!!
 	ERR_BUG, ///< a bug in the software certainly happened, due to a double check failing or unexpected behavior.
 	ERR_PRINTER_ON_FIRE, /// the parallel port printer is engulfed in flames
-	ERR_OMFG_THIS_IS_VERY_VERY_BAD, ///< shit happens, has never been used, though
-	ERR_WTF = ERR_OMFG_THIS_IS_VERY_VERY_BAD ///< short version of the above
 };
 
 #endif

+ 0 - 1
core/global_constants.cpp

@@ -491,7 +491,6 @@ void register_global_constants() {
 	BIND_GLOBAL_ENUM_CONSTANT(ERR_BUSY);
 	BIND_GLOBAL_ENUM_CONSTANT(ERR_HELP); ///< user requested help!!
 	BIND_GLOBAL_ENUM_CONSTANT(ERR_BUG); ///< a bug in the software certainly happened ), due to a double check failing or unexpected behavior.
-	BIND_GLOBAL_ENUM_CONSTANT(ERR_WTF);
 
 	BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_NONE);
 	BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_RANGE);

+ 0 - 2
core/ustring.cpp

@@ -3380,8 +3380,6 @@ bool String::is_valid_float() const {
 		from++;
 	}
 
-	//this was pulled out of my ass, i wonder if it's correct...
-
 	bool exponent_found = false;
 	bool period_found = false;
 	bool sign_found = false;

+ 0 - 3
doc/classes/@GlobalScope.xml

@@ -1190,9 +1190,6 @@
 		<constant name="ERR_BUG" value="47" enum="Error">
 			Bug error
 		</constant>
-		<constant name="ERR_WTF" value="49" enum="Error">
-			WTF error (something probably went really wrong)
-		</constant>
 		<constant name="PROPERTY_HINT_NONE" value="0" enum="PropertyHint">
 			No hint for edited property.
 		</constant>

+ 3 - 3
drivers/gles3/shader_gles3.cpp

@@ -343,7 +343,7 @@ ShaderGLES3::Version *ShaderGLES3::get_current_version() {
 			glDeleteProgram(v.id);
 			v.id = 0;
 
-			ERR_PRINT("NO LOG, WTF");
+			ERR_PRINT("Vertex shader compilation failed with empty log");
 		} else {
 
 			if (iloglen == 0) {
@@ -451,7 +451,7 @@ ShaderGLES3::Version *ShaderGLES3::get_current_version() {
 			glDeleteShader(v.vert_id);
 			glDeleteProgram(v.id);
 			v.id = 0;
-			ERR_PRINT("NO LOG, WTF");
+			ERR_PRINT("Fragment shader compilation failed with empty log");
 		} else {
 
 			if (iloglen == 0) {
@@ -624,7 +624,7 @@ void ShaderGLES3::setup(const char **p_conditional_defines, int p_conditional_co
 	feedbacks = p_feedback;
 	feedback_count = p_feedback_count;
 
-	//split vertex and shader code (thank you, retarded shader compiler programmers from you know what company).
+	//split vertex and shader code (thank you, shader compiler programmers from you know what company).
 	{
 		String globals_tag = "\nVERTEX_SHADER_GLOBALS";
 		String material_tag = "\nMATERIAL_UNIFORMS";

+ 1 - 1
drivers/unix/rw_lock_posix.cpp

@@ -39,7 +39,7 @@ void RWLockPosix::read_lock() {
 
 	int err = pthread_rwlock_rdlock(&rwlock);
 	if (err != 0) {
-		perror("wtf: ");
+		perror("Acquiring lock failed");
 	}
 	ERR_FAIL_COND(err != 0);
 }

+ 2 - 2
drivers/unix/stream_peer_tcp_posix.cpp

@@ -213,7 +213,7 @@ Error StreamPeerTCPPosix::write(const uint8_t *p_data, int p_bytes, int &r_sent,
 
 			if (errno != EAGAIN) {
 
-				perror("shit?");
+				perror("Nothing sent");
 				disconnect_from_host();
 				ERR_PRINT("Server disconnected!\n");
 				return FAILED;
@@ -270,7 +270,7 @@ Error StreamPeerTCPPosix::read(uint8_t *p_buffer, int p_bytes, int &r_received,
 
 			if (errno != EAGAIN) {
 
-				perror("shit?");
+				perror("Nothing read");
 				disconnect_from_host();
 				ERR_PRINT("Server disconnected!\n");
 				return FAILED;

+ 0 - 2
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

+ 1 - 2
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
     }
 }

+ 1 - 1
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;

+ 1 - 1
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;
 	}

+ 1 - 1
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);

+ 9 - 9
platform/android/java/src/org/godotengine/godot/Godot.java

@@ -970,7 +970,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
         boolean indeterminate;
         switch (newState) {
             case IDownloaderClient.STATE_IDLE:
-            	Log.d("GODOT", "STATE IDLE");
+            	Log.d("GODOT", "DOWNLOAD STATE IDLE");
                 // STATE_IDLE means the service is listening, so it's
                 // safe to start making calls via mRemoteService.
                 paused = false;
@@ -978,13 +978,13 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
                 break;
             case IDownloaderClient.STATE_CONNECTING:
             case IDownloaderClient.STATE_FETCHING_URL:
-            	Log.d("GODOT", "STATE CONNECTION / FETCHING URL");
+            	Log.d("GODOT", "DOWNLOAD STATE CONNECTION / FETCHING URL");
                 showDashboard = true;
                 paused = false;
                 indeterminate = true;
                 break;
             case IDownloaderClient.STATE_DOWNLOADING:
-            	Log.d("GODOT", "STATE DOWNLOADING");
+            	Log.d("GODOT", "DOWNLOAD STATE DOWNLOADING");
                 paused = false;
                 showDashboard = true;
                 indeterminate = false;
@@ -994,14 +994,14 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
             case IDownloaderClient.STATE_FAILED:
             case IDownloaderClient.STATE_FAILED_FETCHING_URL:
             case IDownloaderClient.STATE_FAILED_UNLICENSED:
-            	Log.d("GODOT", "MANY TYPES OF FAILING");
+            	Log.d("GODOT", "DOWNLOAD STATE: FAILED, CANCELLED, UNLICENSED OR FAILED TO FETCH URL");
                 paused = true;
                 showDashboard = false;
                 indeterminate = false;
                 break;
             case IDownloaderClient.STATE_PAUSED_NEED_CELLULAR_PERMISSION:
             case IDownloaderClient.STATE_PAUSED_WIFI_DISABLED_NEED_CELLULAR_PERMISSION:
-            	Log.d("GODOT", "PAUSED FOR SOME STUPID REASON");
+            	Log.d("GODOT", "DOWNLOAD STATE: PAUSED BY MISSING CELLULAR PERMISSION");
                 showDashboard = false;
                 paused = true;
                 indeterminate = false;
@@ -1009,18 +1009,18 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
                 break;
 
             case IDownloaderClient.STATE_PAUSED_BY_REQUEST:
-            	Log.d("GODOT", "PAUSED BY STUPID USER");
+            	Log.d("GODOT", "DOWNLOAD STATE: PAUSED BY USER");
                 paused = true;
                 indeterminate = false;
                 break;
             case IDownloaderClient.STATE_PAUSED_ROAMING:
             case IDownloaderClient.STATE_PAUSED_SDCARD_UNAVAILABLE:
-            	Log.d("GODOT", "PAUSED BY ROAMING      WTF!?");
+            	Log.d("GODOT", "DOWNLOAD STATE: PAUSED BY ROAMING OR SDCARD UNAVAILABLE");
                 paused = true;
                 indeterminate = false;
                 break;
             case IDownloaderClient.STATE_COMPLETED:
-            	Log.d("GODOT", "COMPLETED");
+            	Log.d("GODOT", "DOWNLOAD STATE: COMPLETED");
                 showDashboard = false;
                 paused = false;
                 indeterminate = false;
@@ -1028,7 +1028,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
                 initializeGodot();
                 return;
             default:
-            	Log.d("GODOT", "DEFAULT ????");
+            	Log.d("GODOT", "DOWNLOAD STATE: DEFAULT");
                 paused = true;
                 indeterminate = true;
                 showDashboard = true;

+ 0 - 1
platform/osx/os_osx.h

@@ -43,7 +43,6 @@
 #include "servers/visual_server.h"
 #include <ApplicationServices/ApplicationServices.h>
 
-//bitch
 #undef CursorShape
 /**
 	@author Juan Linietsky <[email protected]>

+ 0 - 1
platform/server/os_server.h

@@ -38,7 +38,6 @@
 #include "servers/visual/rasterizer.h"
 #include "servers/visual_server.h"
 
-//bitch
 #undef CursorShape
 /**
 	@author Juan Linietsky <[email protected]>

+ 2 - 2
platform/windows/stream_peer_winsock.cpp

@@ -141,7 +141,7 @@ Error StreamPeerWinsock::write(const uint8_t *p_data, int p_bytes, int &r_sent,
 
 			if (WSAGetLastError() != WSAEWOULDBLOCK) {
 
-				perror("shit?");
+				perror("Nothing sent");
 				disconnect_from_host();
 				ERR_PRINT("Server disconnected!\n");
 				return FAILED;
@@ -197,7 +197,7 @@ Error StreamPeerWinsock::read(uint8_t *p_buffer, int p_bytes, int &r_received, b
 
 			if (WSAGetLastError() != WSAEWOULDBLOCK) {
 
-				perror("shit?");
+				perror("Nothing read");
 				disconnect_from_host();
 				ERR_PRINT("Server disconnected!\n");
 				return FAILED;

+ 1 - 1
scene/resources/packed_scene.cpp

@@ -177,7 +177,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
 			node = Object::cast_to<Node>(obj);
 
 		} else {
-			print_line("wtf class is disabled for: " + itos(n.type));
+			print_line("Class is disabled for: " + itos(n.type));
 			print_line("name: " + String(snames[n.type]));
 		}