From 67f6834bc3c0dcf1217522744732486cccdb28d9 Mon Sep 17 00:00:00 2001 From: Yona-TYT Date: Fri, 6 Dec 2024 16:02:29 -0400 Subject: [PATCH] Rename allow rulues to clear --- src/simutrans/dataobj/scenario.cc | 6 +++--- src/simutrans/dataobj/scenario.h | 4 ++-- src/simutrans/script/api/api_scenario.cc | 4 ++-- tests/tests/test_scenario.nut | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/simutrans/dataobj/scenario.cc b/src/simutrans/dataobj/scenario.cc index 06fa5fa5e..900d24793 100644 --- a/src/simutrans/dataobj/scenario.cc +++ b/src/simutrans/dataobj/scenario.cc @@ -420,9 +420,9 @@ void scenario_t::forbid_way_tool_rect(uint8 player_nr, uint16 tool_id, waytype_t } -void scenario_t::allow_way_tool_rect(uint8 player_nr, uint16 tool_id, waytype_t wt, const char* param, koord pos_nw, koord pos_se) +void scenario_t::clear_way_tool_rect(uint8 player_nr, uint16 tool_id, waytype_t wt, const char* param, koord pos_nw, koord pos_se) { - allow_way_tool_cube(player_nr, tool_id, wt, param, koord3d(pos_nw, -128), koord3d(pos_se, 127)); + clear_way_tool_cube(player_nr, tool_id, wt, param, koord3d(pos_nw, -128), koord3d(pos_se, 127)); } @@ -439,7 +439,7 @@ void scenario_t::forbid_way_tool_cube(uint8 player_nr, uint16 tool_id, waytype_t } -void scenario_t::allow_way_tool_cube(uint8 player_nr, uint16 tool_id, waytype_t wt, const char *param, koord3d pos_nw_0, koord3d pos_se_0) +void scenario_t::clear_way_tool_cube(uint8 player_nr, uint16 tool_id, waytype_t wt, const char *param, koord3d pos_nw_0, koord3d pos_se_0) { koord pos_nw( min(pos_nw_0.x, pos_se_0.x), min(pos_nw_0.y, pos_se_0.y)); koord pos_se( max(pos_nw_0.x, pos_se_0.x), max(pos_nw_0.y, pos_se_0.y)); diff --git a/src/simutrans/dataobj/scenario.h b/src/simutrans/dataobj/scenario.h index fb58d4f09..97db469f2 100644 --- a/src/simutrans/dataobj/scenario.h +++ b/src/simutrans/dataobj/scenario.h @@ -395,7 +395,7 @@ public: * @ingroup squirrel-api * @see forbid_way_tool_rect */ - void allow_way_tool_rect(uint8 player_nr, uint16 tool_id, waytype_t wt, const char* param, koord pos_nw, koord pos_se); + void clear_way_tool_rect(uint8 player_nr, uint16 tool_id, waytype_t wt, const char* param, koord pos_nw, koord pos_se); /** * Forbid tool with certain waytype within cubic region on the map. @@ -415,7 +415,7 @@ public: * @ingroup squirrel-api * @see forbid_way_tool_cube */ - void allow_way_tool_cube(uint8 player_nr, uint16 tool_id, waytype_t wt, const char* param, koord3d pos_nw, koord3d pos_se); + void clear_way_tool_cube(uint8 player_nr, uint16 tool_id, waytype_t wt, const char* param, koord3d pos_nw, koord3d pos_se); /** * Clears all rules. diff --git a/src/simutrans/script/api/api_scenario.cc b/src/simutrans/script/api/api_scenario.cc index 8585b442d..c3dccbb70 100644 --- a/src/simutrans/script/api/api_scenario.cc +++ b/src/simutrans/script/api/api_scenario.cc @@ -217,7 +217,7 @@ void export_scenario(HSQUIRRELVM vm) * @param pos_se coordinate of south-eastern corner of rectangle * @see tool_ids way_types player_all */ - STATIC register_method(vm, &scenario_t::allow_way_tool_rect, "allow_way_tool_rect"); + STATIC register_method(vm, &scenario_t::clear_way_tool_rect, "clear_way_tool_rect"); /** * Forbid tool with certain waytype within cubic region on the map. @@ -246,7 +246,7 @@ void export_scenario(HSQUIRRELVM vm) * @param pos_se 3d-coordinate of south-eastern corner of cube * @see tool_ids way_types player_all */ - STATIC register_method(vm, &scenario_t::allow_way_tool_cube, "allow_way_tool_cube"); + STATIC register_method(vm, &scenario_t::clear_way_tool_cube, "clear_way_tool_cube"); /** * Clear all forbidding rules, effectively allowing all tools again that were forbidden using functions of the table @ref rules. diff --git a/tests/tests/test_scenario.nut b/tests/tests/test_scenario.nut index b9a0f286e..a12cc2c26 100644 --- a/tests/tests/test_scenario.nut +++ b/tests/tests/test_scenario.nut @@ -303,7 +303,7 @@ function test_scenario_rules_allow_forbid_tool_stacked_rect() ]) } - rules.allow_way_tool_rect(0, tool_build_way, wt_road, "", coord(2, 2), coord(13, 13)) + rules.clear_way_tool_rect(0, tool_build_way, wt_road, "", coord(2, 2), coord(13, 13)) // try building in allowed ring, does not work because rules cannot be stacked { @@ -369,7 +369,7 @@ function test_scenario_rules_allow_forbid_tool_stacked_cube() ]) } - rules.allow_way_tool_cube(0, tool_build_way, wt_road, "", coord3d(2, 2, 0), coord3d(13, 13, 0)) + rules.clear_way_tool_cube(0, tool_build_way, wt_road, "", coord3d(2, 2, 0), coord3d(13, 13, 0)) // try building in allowed ring, does not work because rules cannot be stacked { -- 2.47.1