From 2ca48feef71b20a82164eb2462ae6b9bb57c2114 Mon Sep 17 00:00:00 2001 From: Ryan Hechenberger Date: Fri, 26 Jun 2026 15:50:32 +1000 Subject: [PATCH 1/2] adjust patch apply to inside gridmap_scenario --- apps/warthog.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/warthog.cpp b/apps/warthog.cpp index f27e96f..b13192a 100644 --- a/apps/warthog.cpp +++ b/apps/warthog.cpp @@ -7,6 +7,8 @@ // @created: 2016-11-23 // +#include + #include #include #include @@ -29,7 +31,6 @@ #include "cfg.h" #include -#include #include #include @@ -160,6 +161,12 @@ struct gridmap_scenario if(!patches.load(map)) { return false; } return run.gridmap_init(grid, patches); } + + bool + apply_patches() + { + return run.gridmap_apply_patches(grid, patches) >= 0; + } }; template @@ -188,7 +195,7 @@ run_experiments( if(exp == nullptr) { break; } if(patch_count != 0) { - if(scen.run.gridmap_apply_patches(scen.grid, scen.patches) < 0) + if(!scen.apply_patches()) { // failed to apply patches, exit WARTHOG_GCRIT("dynamic patch error: failed to apply patches"); From 1974610a605bfa50ccda6d47cada635f0f22d4ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2026 06:19:03 +0000 Subject: [PATCH 2/2] auto clang-format action --- apps/warthog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/warthog.cpp b/apps/warthog.cpp index b13192a..e75af24 100644 --- a/apps/warthog.cpp +++ b/apps/warthog.cpp @@ -161,7 +161,7 @@ struct gridmap_scenario if(!patches.load(map)) { return false; } return run.gridmap_init(grid, patches); } - + bool apply_patches() {