From c9a520f9c364ebcca65d2bf23730f3d8d9a56816 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 24 Apr 2022 15:13:50 +0200 Subject: [PATCH] Better error handling and fix potential crash in the overlapping WFC class. --- modules/wfc/overlapping_wave_form_collapse.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/wfc/overlapping_wave_form_collapse.cpp b/modules/wfc/overlapping_wave_form_collapse.cpp index 356b3df9b..c34b867ea 100644 --- a/modules/wfc/overlapping_wave_form_collapse.cpp +++ b/modules/wfc/overlapping_wave_form_collapse.cpp @@ -68,6 +68,8 @@ Array2D OverlappingWaveFormCollapse::run() { void OverlappingWaveFormCollapse::init_ground() { int ground_pattern_id = get_ground_pattern_id(); + ERR_FAIL_COND(ground_pattern_id == -1); + for (int j = 0; j < get_wave_width(); j++) { set_pattern(ground_pattern_id, get_wave_height() - 1, j); } @@ -106,7 +108,7 @@ int OverlappingWaveFormCollapse::get_ground_pattern_id() { } } - ERR_FAIL_V(0); + ERR_FAIL_V(-1); } int OverlappingWaveFormCollapse::get_pattern_id(const Array2D &pattern) {