Fix MSVC warning C4706: assignment within conditional expression

Part of #66537.

3 files changed, 62 insertions, 39 deletions

diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index cbeb073ee5..57f055ca42 100644
--- a/modules/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -91,8 +91,6 @@ void VideoStreamPlaybackTheora::video_write() {
 		uint8_t *w = frame_data.ptrw();
 		char *dst = (char *)w;
 
-		//uv_offset=(ti.pic_x/2)+(yuv[1].stride)*(ti.pic_y/2);
-
 		if (px_fmt == TH_PF_444) {
 			yuv444_2_rgb8888((uint8_t *)dst, (uint8_t *)yuv[0].data, (uint8_t *)yuv[1].data, (uint8_t *)yuv[2].data, size.x, size.y, yuv[0].stride, yuv[1].stride, size.x << 2);
 
@@ -101,7 +99,7 @@ void VideoStreamPlaybackTheora::video_write() {
 
 		} else if (px_fmt == TH_PF_420) {
 			yuv420_2_rgb8888((uint8_t *)dst, (uint8_t *)yuv[0].data, (uint8_t *)yuv[1].data, (uint8_t *)yuv[2].data, size.x, size.y, yuv[0].stride, yuv[1].stride, size.x << 2);
-		};
+		}
 
 		format = Image::FORMAT_RGBA8;
 	}
@@ -123,7 +121,7 @@ void VideoStreamPlaybackTheora::clear() {
 		if (vorbis_p >= 3) {
 			vorbis_block_clear(&vb);
 			vorbis_dsp_clear(&vd);
-		};
+		}
 		vorbis_comment_clear(&vc);
 		vorbis_info_clear(&vi);
 		vorbis_p = 0;
@@ -154,7 +152,7 @@ void VideoStreamPlaybackTheora::clear() {
 
 	file.unref();
 	playing = false;
-};
+}
 
 void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 	ERR_FAIL_COND(playing);
@@ -174,7 +172,6 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 	ring_buffer.write(read_buffer.ptr(), read);
 
 	thread.start(_streaming_thread, this);
-
 #endif
 
 	ogg_sync_init(&oy);
@@ -245,6 +242,12 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 
 	/* we're expecting more header packets. */
 	while ((theora_p && theora_p < 3) || (vorbis_p && vorbis_p < 3)) {
+#ifdef _MSC_VER
+		// Make exception for these assignments in conditional expression.
+#pragma warning(push)
+#pragma warning(disable : 4706)
+#endif
+
 		int ret;
 
 		/* look for further theora headers */
@@ -281,6 +284,10 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 			}
 		}
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 		/* The header pages/packets will arrive before anything else we
 		care about, or the stream is not obeying spec */
 
@@ -355,14 +362,14 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 	buffering = true;
 	time = 0;
 	audio_frames_wrote = 0;
-};
+}
 
 double VideoStreamPlaybackTheora::get_time() const {
 	// FIXME: AudioServer output latency was fixed in af9bb0e, previously it used to
 	// systematically return 0. Now that it gives a proper latency, it broke this
 	// code where the delay compensation likely never really worked.
 	return time - /* AudioServer::get_singleton()->get_output_latency() - */ delay_compensation;
-};
+}
 
 Ref<Texture2D> VideoStreamPlaybackTheora::get_texture() const {
 	return texture;
@@ -376,7 +383,7 @@ void VideoStreamPlaybackTheora::update(double p_delta) {
 	if (!playing || paused) {
 		//printf("not playing\n");
 		return;
-	};
+	}
 
 #ifdef THEORA_USE_THREAD_STREAMING
 	thread_sem->post();
@@ -444,7 +451,7 @@ void VideoStreamPlaybackTheora::update(double p_delta) {
 					}
 				} else { /* we need more data; break out to suck in another page */
 					break;
-				};
+				}
 			}
 
 			audio_done = videobuf_time < (audio_frames_wrote / float(vi.rate));
@@ -507,7 +514,7 @@ void VideoStreamPlaybackTheora::update(double p_delta) {
 			//printf("video done, stopping\n");
 			stop();
 			return;
-		};
+		}
 
 		if (!frame_done || !audio_done) {
 			//what's the point of waiting for audio to grab a page?
@@ -539,7 +546,7 @@ void VideoStreamPlaybackTheora::update(double p_delta) {
 	}
 
 	video_write();
-};
+}
 
 void VideoStreamPlaybackTheora::play() {
 	if (!playing) {
@@ -551,7 +558,7 @@ void VideoStreamPlaybackTheora::play() {
 	playing = true;
 	delay_compensation = ProjectSettings::get_singleton()->get("audio/video/video_delay_compensation_ms");
 	delay_compensation /= 1000.0;
-};
+}
 
 void VideoStreamPlaybackTheora::stop() {
 	if (playing) {
@@ -560,42 +567,42 @@ void VideoStreamPlaybackTheora::stop() {
 	}
 	playing = false;
 	time = 0;
-};
+}
 
 bool VideoStreamPlaybackTheora::is_playing() const {
 	return playing;
-};
+}
 
 void VideoStreamPlaybackTheora::set_paused(bool p_paused) {
 	paused = p_paused;
-};
+}
 
 bool VideoStreamPlaybackTheora::is_paused() const {
 	return paused;
-};
+}
 
 void VideoStreamPlaybackTheora::set_loop(bool p_enable) {
 }
 
 bool VideoStreamPlaybackTheora::has_loop() const {
 	return false;
-};
+}
 
 double VideoStreamPlaybackTheora::get_length() const {
 	return 0;
-};
+}
 
 String VideoStreamPlaybackTheora::get_stream_name() const {
 	return "";
-};
+}
 
 int VideoStreamPlaybackTheora::get_loop_count() const {
 	return 0;
-};
+}
 
 double VideoStreamPlaybackTheora::get_playback_position() const {
 	return get_time();
-};
+}
 
 void VideoStreamPlaybackTheora::seek(double p_time) {
 	WARN_PRINT_ONCE("Seeking in Theora videos is not implemented yet (it's only supported for GDExtension-provided video streams).");
@@ -650,15 +657,14 @@ VideoStreamPlaybackTheora::VideoStreamPlaybackTheora() {
 	thread_sem = Semaphore::create();
 
 #endif
-};
+}
 
 VideoStreamPlaybackTheora::~VideoStreamPlaybackTheora() {
 #ifdef THEORA_USE_THREAD_STREAMING
-
 	memdelete(thread_sem);
 #endif
 	clear();
-};
+}
 
 void VideoStreamTheora::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_file", "file"), &VideoStreamTheora::set_file);
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
index bd220df104..9cb61a83f2 100644
--- a/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp
@@ -153,8 +153,11 @@ int AudioStreamPlaybackOggVorbis::_mix_frames_vorbis(AudioFrame *p_buffer, int p
 			return -1;
 		}
 
-		ERR_FAIL_COND_V_MSG((err = vorbis_synthesis(&block, packet)), 0, "Error during vorbis synthesis " + itos(err));
-		ERR_FAIL_COND_V_MSG((err = vorbis_synthesis_blockin(&dsp_state, &block)), 0, "Error during vorbis block processing " + itos(err));
+		err = vorbis_synthesis(&block, packet);
+		ERR_FAIL_COND_V_MSG(err != 0, 0, "Error during vorbis synthesis " + itos(err));
+
+		err = vorbis_synthesis_blockin(&dsp_state, &block);
+		ERR_FAIL_COND_V_MSG(err != 0, 0, "Error during vorbis block processing " + itos(err));
 
 		have_packets_left = !packet->e_o_s;
 	}
@@ -290,11 +293,15 @@ void AudioStreamPlaybackOggVorbis::seek(double p_time) {
 			headers_remaining = 3;
 		}
 		if (!headers_remaining) {
-			ERR_FAIL_COND_MSG((err = vorbis_synthesis(&block, packet)), "Error during vorbis synthesis " + itos(err));
-			ERR_FAIL_COND_MSG((err = vorbis_synthesis_blockin(&dsp_state, &block)), "Error during vorbis block processing " + itos(err));
+			err = vorbis_synthesis(&block, packet);
+			ERR_FAIL_COND_MSG(err != 0, "Error during vorbis synthesis " + itos(err));
+
+			err = vorbis_synthesis_blockin(&dsp_state, &block);
+			ERR_FAIL_COND_MSG(err != 0, "Error during vorbis block processing " + itos(err));
 
 			int samples_out = vorbis_synthesis_pcmout(&dsp_state, nullptr);
-			ERR_FAIL_COND_MSG((err = vorbis_synthesis_read(&dsp_state, samples_out)), "Error during vorbis read updating " + itos(err));
+			err = vorbis_synthesis_read(&dsp_state, samples_out);
+			ERR_FAIL_COND_MSG(err != 0, "Error during vorbis read updating " + itos(err));
 
 			samples_in_page += samples_out;
 
@@ -341,12 +348,16 @@ void AudioStreamPlaybackOggVorbis::seek(double p_time) {
 			headers_remaining = 3;
 		}
 		if (!headers_remaining) {
-			ERR_FAIL_COND_MSG((err = vorbis_synthesis(&block, packet)), "Error during vorbis synthesis " + itos(err));
-			ERR_FAIL_COND_MSG((err = vorbis_synthesis_blockin(&dsp_state, &block)), "Error during vorbis block processing " + itos(err));
+			err = vorbis_synthesis(&block, packet);
+			ERR_FAIL_COND_MSG(err != 0, "Error during vorbis synthesis " + itos(err));
+
+			err = vorbis_synthesis_blockin(&dsp_state, &block);
+			ERR_FAIL_COND_MSG(err != 0, "Error during vorbis block processing " + itos(err));
 
 			int samples_out = vorbis_synthesis_pcmout(&dsp_state, nullptr);
 			int read_samples = samples_to_burn > samples_out ? samples_out : samples_to_burn;
-			ERR_FAIL_COND_MSG((err = vorbis_synthesis_read(&dsp_state, samples_out)), "Error during vorbis read updating " + itos(err));
+			err = vorbis_synthesis_read(&dsp_state, samples_out);
+			ERR_FAIL_COND_MSG(err != 0, "Error during vorbis read updating " + itos(err));
 			samples_to_burn -= read_samples;
 
 			if (samples_to_burn <= 0) {
diff --git a/modules/vorbis/resource_importer_ogg_vorbis.cpp b/modules/vorbis/resource_importer_ogg_vorbis.cpp
index bf5f7206b8..a491c3d3fb 100644
--- a/modules/vorbis/resource_importer_ogg_vorbis.cpp
+++ b/modules/vorbis/resource_importer_ogg_vorbis.cpp
@@ -110,15 +110,18 @@ Ref<AudioStreamOggVorbis> ResourceImporterOggVorbis::import_ogg_vorbis(const Str
 	size_t packet_count = 0;
 	bool done = false;
 	while (!done) {
-		ERR_FAIL_COND_V_MSG((err = ogg_sync_check(&sync_state)), Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
+		err = ogg_sync_check(&sync_state);
+		ERR_FAIL_COND_V_MSG(err != 0, Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
 		while (ogg_sync_pageout(&sync_state, &page) != 1) {
 			if (cursor >= len) {
 				done = true;
 				break;
 			}
-			ERR_FAIL_COND_V_MSG((err = ogg_sync_check(&sync_state)), Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
+			err = ogg_sync_check(&sync_state);
+			ERR_FAIL_COND_V_MSG(err != 0, Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
 			char *sync_buf = ogg_sync_buffer(&sync_state, OGG_SYNC_BUFFER_SIZE);
-			ERR_FAIL_COND_V_MSG((err = ogg_sync_check(&sync_state)), Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
+			err = ogg_sync_check(&sync_state);
+			ERR_FAIL_COND_V_MSG(err != 0, Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
 			ERR_FAIL_COND_V(cursor > len, Ref<AudioStreamOggVorbis>());
 			size_t copy_size = len - cursor;
 			if (copy_size > OGG_SYNC_BUFFER_SIZE) {
@@ -127,12 +130,14 @@ Ref<AudioStreamOggVorbis> ResourceImporterOggVorbis::import_ogg_vorbis(const Str
 			memcpy(sync_buf, &file_data[cursor], copy_size);
 			ogg_sync_wrote(&sync_state, copy_size);
 			cursor += copy_size;
-			ERR_FAIL_COND_V_MSG((err = ogg_sync_check(&sync_state)), Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
+			err = ogg_sync_check(&sync_state);
+			ERR_FAIL_COND_V_MSG(err != 0, Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
 		}
 		if (done) {
 			break;
 		}
-		ERR_FAIL_COND_V_MSG((err = ogg_sync_check(&sync_state)), Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
+		err = ogg_sync_check(&sync_state);
+		ERR_FAIL_COND_V_MSG(err != 0, Ref<AudioStreamOggVorbis>(), "Ogg sync error " + itos(err));
 
 		// Have a page now.
 		if (!initialized_stream) {
@@ -142,7 +147,8 @@ Ref<AudioStreamOggVorbis> ResourceImporterOggVorbis::import_ogg_vorbis(const Str
 			initialized_stream = true;
 		}
 		ogg_stream_pagein(&stream_state, &page);
-		ERR_FAIL_COND_V_MSG((err = ogg_stream_check(&stream_state)), Ref<AudioStreamOggVorbis>(), "Ogg stream error " + itos(err));
+		err = ogg_stream_check(&stream_state);
+		ERR_FAIL_COND_V_MSG(err != 0, Ref<AudioStreamOggVorbis>(), "Ogg stream error " + itos(err));
 		int desync_iters = 0;
 
 		Vector<Vector<uint8_t>> packet_data;