TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move Last_buddy_polish_path_tick to d_unique_buddy_state

Browse source
This commit is contained in:
Kp 2019-03-03 00:31:08 +00:00
parent 9e3c5ec272
commit ee584f1f37
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/object.h
View file

@ -577,6 +577,7 @@ struct d_unique_buddy_state
uint8_t Buddy_gave_hint_count;
uint8_t Looking_for_marker;
int Last_buddy_key;
int Last_buddy_polish_path_tick;
escort_goal_t Escort_goal_object;
};

7
similar/main/aipath.cpp
View file

@ -504,8 +504,6 @@ cpp_done1: ;
}
#if defined(DXX_BUILD_DESCENT_II)
int Last_buddy_polish_path_tick;
// -------------------------------------------------------------------------------------------------------
// polish_path
// Takes an existing path and makes it nicer.
@ -518,6 +516,7 @@ int Last_buddy_polish_path_tick;
// Only drop up to the first three points.
int polish_path(const vmobjptridx_t objp, point_seg *psegs, int num_points)
{
auto &BuddyState = LevelUniqueObjectState.BuddyState;
int i, first_point=0;
if (num_points <= 4)
@ -527,10 +526,10 @@ int polish_path(const vmobjptridx_t objp, point_seg *psegs, int num_points)
auto &Robot_info = LevelSharedRobotInfoState.Robot_info;
if (Robot_info[get_robot_id(objp)].companion)
{
if (d_tick_count == Last_buddy_polish_path_tick)
if (d_tick_count == BuddyState.Last_buddy_polish_path_tick)
return num_points;
else
Last_buddy_polish_path_tick = d_tick_count;
BuddyState.Last_buddy_polish_path_tick = d_tick_count;
}
// -- MK: 10/18/95: for (i=0; i<num_points-3; i++)