Removed unnecessary assignments

core/math/aabb.cpp

@@ -245,7 +245,6 @@ Vector3 AABB::get_longest_axis() const {
 
 	if (size.z > max_size) {
 		axis = Vector3(0, 0, 1);
-		max_size = size.z;
 	}
 
 	return axis;
@@ -262,7 +261,6 @@ int AABB::get_longest_axis_index() const {
 
 	if (size.z > max_size) {
 		axis = 2;
-		max_size = size.z;
 	}
 
 	return axis;
@@ -280,7 +278,6 @@ Vector3 AABB::get_shortest_axis() const {
 
 	if (size.z < max_size) {
 		axis = Vector3(0, 0, 1);
-		max_size = size.z;
 	}
 
 	return axis;
@@ -297,7 +294,6 @@ int AABB::get_shortest_axis_index() const {
 
 	if (size.z < max_size) {
 		axis = 2;
-		max_size = size.z;
 	}
 
 	return axis;

core/math/bsp_tree.cpp

@@ -244,10 +244,8 @@ bool BSP_Tree::point_is_inside(const Vector3 &p_point) const {
 
 	const Node *nodesptr = &nodes[0];
 	const Plane *planesptr = &planes[0];
-	int plane_count = planes.size();
 
 	int idx = node_count - 1;
-	int steps = 0;
 
 	while (true) {
 
@@ -259,21 +257,19 @@ bool BSP_Tree::point_is_inside(const Vector3 &p_point) const {
 			return true;
 		}
 
-		uint16_t plane = nodesptr[idx].plane;
 #ifdef DEBUG_ENABLED
-
+		int plane_count = planes.size();
+		uint16_t plane = nodesptr[idx].plane;
 		ERR_FAIL_INDEX_V(plane, plane_count, false);
 #endif
+
 		bool over = planesptr[nodesptr[idx].plane].is_point_over(p_point);
 
 		idx = over ? nodes[idx].over : nodes[idx].under;
 
 #ifdef DEBUG_ENABLED
-
 		ERR_FAIL_COND_V(idx < MAX_NODES && idx >= node_count, false);
 #endif
-
-		steps++;
 	}
 
 	return false;

core/translation.cpp

@@ -1171,13 +1171,11 @@ void TranslationServer::_bind_methods() {
 void TranslationServer::load_translations() {
 
 	String locale = get_locale();
-	bool found = _load_translations("locale/translations"); //all
+	_load_translations("locale/translations"); //all
+	_load_translations("locale/translations_" + locale.substr(0, 2));
 
-	if (_load_translations("locale/translations_" + locale.substr(0, 2)))
-		found = true;
 	if (locale.substr(0, 2) != locale) {
-		if (_load_translations("locale/translations_" + locale))
-			found = true;
+		_load_translations("locale/translations_" + locale);
 	}
 }
 

drivers/dummy/texture_loader_dummy.cpp

@@ -45,10 +45,6 @@ RES ResourceFormatDummyTexture::load(const String &p_path, const String &p_origi
 
 	dstbuff.resize(rowsize * height);
 
-	PoolVector<uint8_t>::Write dstbuff_write = dstbuff.write();
-
-	uint8_t *data = dstbuff_write.ptr();
-
 	uint8_t **row_p = memnew_arr(uint8_t *, height);
 
 	for (unsigned int i = 0; i < height; i++) {

drivers/pulseaudio/audio_driver_pulseaudio.cpp

@@ -403,7 +403,6 @@ AudioDriver::SpeakerMode AudioDriverPulseAudio::get_speaker_mode() const {
 
 void AudioDriverPulseAudio::pa_sinklist_cb(pa_context *c, const pa_sink_info *l, int eol, void *userdata) {
 	AudioDriverPulseAudio *ad = (AudioDriverPulseAudio *)userdata;
-	int ctr = 0;
 
 	// If eol is set to a positive number, you're at the end of the list
 	if (eol > 0) {

drivers/xaudio2/audio_driver_xaudio2.cpp

@@ -97,8 +97,6 @@ void AudioDriverXAudio2::thread_func(void *p_udata) {
 
 	AudioDriverXAudio2 *ad = (AudioDriverXAudio2 *)p_udata;
 
-	uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate)) * 1000000;
-
 	while (!ad->exit_thread) {
 
 		if (!ad->active) {

editor/editor_node.cpp

@@ -156,7 +156,6 @@ void EditorNode::_update_scene_tabs() {
 
 	scene_tabs->set_current_tab(editor_data.get_edited_scene());
 
-	int current = editor_data.get_edited_scene();
 	if (scene_tabs->get_offset_buttons_visible()) {
 		// move add button to fixed position on the tabbar
 		if (scene_tab_add->get_parent() == scene_tabs) {

editor/editor_themes.cpp

@@ -237,8 +237,6 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme =
 	ImageLoaderSVG::set_convert_colors(NULL);
 
 	clock_t end_time = clock();
-
-	double time_d = (double)(end_time - begin_time) / CLOCKS_PER_SEC;
 #else
 	print_line("Sorry no icons for you");
 #endif
@@ -257,7 +255,6 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 
 	String preset = EDITOR_DEF("interface/theme/preset", "Default");
 
-	int icon_font_color_setting = EDITOR_DEF("interface/theme/icon_and_font_color", 0);
 	bool highlight_tabs = EDITOR_DEF("interface/theme/highlight_tabs", false);
 	int border_size = EDITOR_DEF("interface/theme/border_size", 1);
 

editor/plugins/script_editor_plugin.cpp

@@ -2239,8 +2239,6 @@ void ScriptEditor::_make_script_list_context_menu() {
 		context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/close_file"), FILE_CLOSE);
 	}
 
-	EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_child(selected));
-
 	context_menu->add_separator();
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/window_move_up"), WINDOW_MOVE_UP);
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/window_move_down"), WINDOW_MOVE_DOWN);

modules/gdnative/nativescript/api_generator.cpp

@@ -110,7 +110,6 @@ struct ClassAPI {
 	bool is_singleton;
 	bool is_instanciable;
 	// @Unclear
-	bool is_creatable;
 	bool is_reference;
 
 	List<MethodAPI> methods;
@@ -385,7 +384,6 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
 		source.push_back(String("\t\t\"instanciable\": ") + (api.is_instanciable ? "true" : "false") + ",\n");
 		source.push_back(String("\t\t\"is_reference\": ") + (api.is_reference ? "true" : "false") + ",\n");
 		// @Unclear
-		// source.push_back(String("\t\t\"createable\": ") + (api.is_creatable ? "true" : "false") + ",\n");
 
 		source.push_back("\t\t\"constants\": {\n");
 		for (List<ConstantAPI>::Element *e = api.constants.front(); e; e = e->next()) {

modules/websocket/emws_client.cpp

@@ -64,7 +64,6 @@ Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
 
 	String str = "ws://";
 	String proto_string = "";
-	int i = 0;
 
 	if (p_ssl)
 		str = "wss://";

platform/android/audio_driver_opensl.cpp

@@ -146,9 +146,6 @@ void AudioDriverOpenSL::start() {
 	res = (*sl)->GetInterface(sl, SL_IID_ENGINE, (void *)&EngineItf);
 
 	ERR_FAIL_COND(res != SL_RESULT_SUCCESS);
-	/* Initialize arrays required[] and iidArray[] */
-	SLboolean required[MAX_NUMBER_INTERFACES];
-	SLInterfaceID iidArray[MAX_NUMBER_INTERFACES];
 
 	{
 		const SLInterfaceID ids[1] = { SL_IID_ENVIRONMENTALREVERB };
@@ -188,10 +185,7 @@ void AudioDriverOpenSL::start() {
 	//cntxt.pDataBase = (void*)&pcmData;
 	//cntxt.pData = cntxt.pDataBase;
 	//cntxt.size = sizeof(pcmData);
-	/* Set arrays required[] and iidArray[] for SEEK interface
-	(PlayItf is implicit) */
-	required[0] = SL_BOOLEAN_TRUE;
-	iidArray[0] = SL_IID_BUFFERQUEUE;
+
 	/* Create the music player */
 
 	{

platform/android/dir_access_jandroid.cpp

@@ -153,7 +153,6 @@ String DirAccessJAndroid::get_current_dir() {
 
 bool DirAccessJAndroid::file_exists(String p_file) {
 
-	JNIEnv *env = ThreadAndroid::get_env();
 	String sd;
 	if (current_dir == "")
 		sd = p_file;

platform/android/export/export.cpp

@@ -528,11 +528,9 @@ class EditorExportAndroid : public EditorExportPlatform {
 		bool exported = false;
 		for (int i = 0; i < p_so.tags.size(); ++i) {
 			// shared objects can be fat (compatible with multiple ABIs)
-			int start_pos = 0;
 			int abi_index = abis.find(p_so.tags[i]);
 			if (abi_index != -1) {
 				exported = true;
-				start_pos = abi_index + 1;
 				String abi = abis[abi_index];
 				String dst_path = "lib/" + abi + "/" + p_so.path.get_file();
 				Vector<uint8_t> array = FileAccess::get_file_as_array(p_so.path);

platform/android/java_glue.cpp

@@ -880,7 +880,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jo
 
 	const char **cmdline = NULL;
 	int cmdlen = 0;
-	bool use_apk_expansion = false;
 	if (p_cmdline) {
 		cmdlen = env->GetArrayLength(p_cmdline);
 		if (cmdlen) {
@@ -891,9 +890,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jo
 
 				jstring string = (jstring)env->GetObjectArrayElement(p_cmdline, i);
 				const char *rawString = env->GetStringUTFChars(string, 0);
-				if (rawString && strcmp(rawString, "--main-pack") == 0) {
-					use_apk_expansion = true;
-				}
 
 				cmdline[i] = rawString;
 			}

platform/android/thread_jandroid.cpp

@@ -132,7 +132,7 @@ JNIEnv *ThreadAndroid::get_env() {
 	}
 
 	JNIEnv *env = NULL;
-	int status = java_vm->AttachCurrentThread(&env, NULL);
+	java_vm->AttachCurrentThread(&env, NULL);
 	return env;
 }
 

platform/iphone/export/export.cpp

@@ -781,7 +781,9 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
 	int ret = unzGoToFirstFile(src_pkg_zip);
 	Vector<uint8_t> project_file_data;
 	while (ret == UNZ_OK) {
+#if defined(OSX_ENABLED) || defined(X11_ENABLED)
 		bool is_execute = false;
+#endif
 
 		//get filename
 		unz_file_info info;
@@ -812,7 +814,9 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
 				continue; //ignore!
 			}
 			found_library = true;
+#if defined(OSX_ENABLED) || defined(X11_ENABLED)
 			is_execute = true;
+#endif
 			file = "godot_ios.a";
 		}
 		if (file == project_file) {
@@ -855,7 +859,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
 			f->close();
 			memdelete(f);
 
-#ifdef OSX_ENABLED
+#if defined(OSX_ENABLED) || defined(X11_ENABLED)
 			if (is_execute) {
 				// we need execute rights on this file
 				chmod(file.utf8().get_data(), 0755);

scene/2d/line_builder.cpp

@@ -292,7 +292,6 @@ void LineBuilder::build() {
 			color1 = gradient->get_color_at_offset(current_distance1 / total_distance);
 		}
 		if (texture_mode == Line2D::LINE_TEXTURE_TILE) {
-			uvx0 = current_distance0 / (width * tile_aspect);
 			uvx1 = current_distance1 / (width * tile_aspect);
 		} else if (texture_mode == Line2D::LINE_TEXTURE_STRETCH) {
 			uvx0 = current_distance0 / total_distance;
@@ -306,7 +305,6 @@ void LineBuilder::build() {
 		u0 = u1;
 		f0 = f1;
 		pos0 = pos1;
-		current_distance0 = current_distance1;
 		if (intersection_result == SEGMENT_INTERSECT) {
 			if (current_joint_mode == Line2D::LINE_JOINT_SHARP) {
 				pos_up0 = pos_up1;

scene/gui/text_edit.cpp

@@ -337,10 +337,6 @@ void TextEdit::_update_scrollbars() {
 	int hscroll_rows = ((hmin.height - 1) / get_row_height()) + 1;
 	int visible_rows = get_visible_rows();
 
-	int first_vis_line = get_first_visible_line();
-	int wi;
-	int num_rows = MAX(visible_rows, num_lines_from_rows(first_vis_line, cursor.wrap_ofs, visible_rows, wi));
-
 	int total_rows = get_total_visible_rows();
 	if (scroll_past_end_of_file_enabled) {
 		total_rows += visible_rows - 1;
@@ -1673,7 +1669,6 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co
 	rows /= get_row_height();
 	rows += get_v_scroll_offset();
 	int first_vis_line = get_first_visible_line();
-	int last_vis_line = get_last_visible_line();
 	int row = first_vis_line + Math::floor(rows);
 	int wrap_index = 0;
 
@@ -3800,7 +3795,6 @@ Vector<String> TextEdit::get_wrap_rows_text(int p_line) const {
 	}
 	// line ends before hit wrap_at; add this word to the substring
 	wrap_substring += word_str;
-	px += word_px;
 	lines.push_back(wrap_substring);
 	return lines;
 }
@@ -5519,9 +5513,8 @@ int TextEdit::get_last_visible_line() const {
 int TextEdit::get_last_visible_line_wrap_index() const {
 
 	int first_vis_line = get_first_visible_line();
-	int last_vis_line = 0;
 	int wi;
-	last_vis_line = first_vis_line + num_lines_from_rows(first_vis_line, cursor.wrap_ofs, get_visible_rows() + 1, wi) - 1;
+	num_lines_from_rows(first_vis_line, cursor.wrap_ofs, get_visible_rows() + 1, wi);
 	return wi;
 }
 

scene/resources/dynamic_font.cpp

@@ -211,9 +211,9 @@ Error DynamicFontAtSize::_load() {
 				scale_color_font = float(id.size) / face->available_sizes[i].width;
 			}
 		}
-		error = FT_Select_Size(face, best_match);
+		FT_Select_Size(face, best_match);
 	} else {
-		error = FT_Set_Pixel_Sizes(face, 0, id.size * oversampling);
+		FT_Set_Pixel_Sizes(face, 0, id.size * oversampling);
 	}
 
 	ascent = (face->size->metrics.ascender / 64.0) / oversampling * scale_color_font;

servers/audio/audio_rb_resampler.cpp

@@ -100,6 +100,8 @@ uint32_t AudioRBResampler::_resample(AudioFrame *p_dest, int p_todo, int32_t p_i
 
 		if (C == 6) {
 
+			// FIXME: Lot of unused assignments here, but it seems like intermediate calculations
+			// should be done as for C == 2 (C == 4 also has some unused assignments).
 			float v0 = rb[(pos * 6) + 0];
 			float v1 = rb[(pos * 6) + 1];
 			float v2 = rb[(pos * 6) + 2];

servers/physics/collision_solver_sat.cpp

@@ -217,8 +217,6 @@ static void _generate_contacts_face_face(const Vector3 *p_points_A, int p_point_
 	// generate contacts
 	//Plane plane_A(p_points_A[0],p_points_A[1],p_points_A[2]);
 
-	int added = 0;
-
 	for (int i = 0; i < clipbuf_len; i++) {
 
 		real_t d = plane_B.distance_to(clipbuf_src[i]);
@@ -233,7 +231,6 @@ static void _generate_contacts_face_face(const Vector3 *p_points_A, int p_point_
 			continue;
 
 		p_callback->call(clipbuf_src[i], closest_B);
-		added++;
 	}
 }
 

servers/visual_server.cpp

@@ -187,16 +187,14 @@ RID VisualServer::_make_test_cube() {
 	PoolVector<float> tangents;
 	PoolVector<Vector3> uvs;
 
-	int vtx_idx = 0;
-#define ADD_VTX(m_idx)                                                             \
-	vertices.push_back(face_points[m_idx]);                                        \
-	normals.push_back(normal_points[m_idx]);                                       \
-	tangents.push_back(normal_points[m_idx][1]);                                   \
-	tangents.push_back(normal_points[m_idx][2]);                                   \
-	tangents.push_back(normal_points[m_idx][0]);                                   \
-	tangents.push_back(1.0);                                                       \
-	uvs.push_back(Vector3(uv_points[m_idx * 2 + 0], uv_points[m_idx * 2 + 1], 0)); \
-	vtx_idx++;
+#define ADD_VTX(m_idx)                           \
+	vertices.push_back(face_points[m_idx]);      \
+	normals.push_back(normal_points[m_idx]);     \
+	tangents.push_back(normal_points[m_idx][1]); \
+	tangents.push_back(normal_points[m_idx][2]); \
+	tangents.push_back(normal_points[m_idx][0]); \
+	tangents.push_back(1.0);                     \
+	uvs.push_back(Vector3(uv_points[m_idx * 2 + 0], uv_points[m_idx * 2 + 1], 0));
 
 	for (int i = 0; i < 6; i++) {