Skip to content

Commit 04a671c

Browse files
committed
simplify list index
1 parent 11b085c commit 04a671c

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

code/parse/sexp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25208,16 +25208,16 @@ void sexp_set_training_context_fly_path(int node)
2520825208
{
2520925209
bool is_nan, is_nan_forever;
2521025210

25211-
waypoint_list *wp_list = find_matching_waypoint_list(CTEXT(node));
25212-
if (wp_list == nullptr)
25211+
int wp_list = find_matching_waypoint_list_index(CTEXT(node));
25212+
if (wp_list < 0)
2521325213
return;
2521425214

2521525215
int distance = eval_num(CDR(node), is_nan, is_nan_forever);
2521625216
if (is_nan || is_nan_forever)
2521725217
return;
2521825218

2521925219
Training_context |= TRAINING_CONTEXT_FLY_PATH;
25220-
Training_context_waypoint_path = find_index_of_waypoint_list(wp_list);
25220+
Training_context_waypoint_path = wp_list;
2522125221
Training_context_distance = static_cast<float>(distance);
2522225222
Training_context_goal_waypoint = 0;
2522325223
Training_context_at_waypoint = -1;

code/scripting/api/libs/mission.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ ADE_FUNC(createWaypoint, l_Mission, "[vector Position, waypointlist List]",
14861486
int waypoint_instance = -1;
14871487
if (wlh && wlh->isValid())
14881488
{
1489-
int wp_list_index = find_index_of_waypoint_list(wlh->getList());
1489+
int wp_list_index = wlh->wl_index;
14901490
int wp_index = static_cast<int>(wlh->getList()->get_waypoints().size()) - 1;
14911491
waypoint_instance = calc_waypoint_instance(wp_list_index, wp_index);
14921492
}

0 commit comments

Comments
 (0)