From d8268aae303d42544eb28a6f86da79e027f4882a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 28 Sep 2022 16:43:09 +0200
Subject: Fix MSVC warnings C4324, C4389, C4456, and C4459

Part of #66537.
---
 modules/gridmap/grid_map.cpp | 2 +-
 modules/raycast/SCsub        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 466a2efd21..05ce2b6147 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -1149,7 +1149,7 @@ TypedArray<Vector3i> GridMap::get_used_cells() const {
 TypedArray<Vector3i> GridMap::get_used_cells_by_item(int p_item) const {
 	TypedArray<Vector3i> a;
 	for (const KeyValue<IndexKey, Cell> &E : cell_map) {
-		if (E.value.item == p_item) {
+		if ((int)E.value.item == p_item) {
 			Vector3i p(E.key.x, E.key.y, E.key.z);
 			a.push_back(p);
 		}
diff --git a/modules/raycast/SCsub b/modules/raycast/SCsub
index 0670c7f468..20b05816e1 100644
--- a/modules/raycast/SCsub
+++ b/modules/raycast/SCsub
@@ -79,6 +79,9 @@ if env["builtin_embree"]:
         else:
             env.Append(LIBS=["psapi"])
 
+    if env.msvc:  # Disable bogus warning about intentional struct padding.
+        env_raycast.Append(CCFLAGS=["/wd4324"])
+
     env_thirdparty = env_raycast.Clone()
     env_thirdparty.force_optimization_on_debug()
     env_thirdparty.disable_warnings()
-- 
cgit v1.2.3