asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some array size function definition mismatch.

Browse source 
(cherry picked from commit 55845bac26)
This commit is contained in:
Fabio Alessandrelli 2022-08-04 13:06:17 +02:00 committed by Rémi Verschelde
parent ecac887aa7
commit fbc7fc44ae
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/input_default.cpp
View file

@ -1050,7 +1050,7 @@ InputDefault::JoyEvent InputDefault::_get_mapped_axis_event(const JoyDeviceMappi
return event; return event;
} }
void InputDefault::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[]) { void InputDefault::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p_hat, JoyEvent r_events[(size_t)HAT_MAX]) {
for (int i = 0; i < mapping.bindings.size(); i++) { for (int i = 0; i < mapping.bindings.size(); i++) {
const JoyBinding binding = mapping.bindings[i]; const JoyBinding binding = mapping.bindings[i];
if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) { if (binding.inputType == TYPE_HAT && binding.input.hat.hat == p_hat) {

2
modules/csg/csg.cpp
View file

@ -729,7 +729,7 @@ void CSGBrushOperation::MeshMerge::mark_inside_faces() {
} }
} }
void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[], const Vector2 p_uvs[], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) { void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[3], const Vector2 p_uvs[3], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
int indices[3]; int indices[3];
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
VertexKey vk; VertexKey vk;