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

Always set hide_segment in init_ai_object

Browse source 
Fixes bug where in the editor, you insert a robot with normal behaviour then play the level - it fails the check on the hide_segment index in init_ai_objects(). This is because hide_segment was written as the poisoned value of 0xfdfd if the behaviour of the robot is AIB_NORMAL - because hide_segment wasn't initialised. Therefore, always setting hide_segment to suppress this exception (it's an inexpensive operation seldom called).
This commit is contained in:
Chris Taylor 2017-01-21 12:20:21 +08:00
parent fd2c8df74e
commit f2f6af5bf1
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
similar/main/ai.cpp
View file

@ -534,17 +534,10 @@ void init_ai_object(object &objp, ai_behavior behavior, const segidx_t hide_segm
ailp->next_misc_sound_time = GameTime64;
ailp->time_player_sound_attacked = GameTime64;
#if defined(DXX_BUILD_DESCENT_I)
if ((behavior == ai_behavior::AIB_HIDE) || (behavior == ai_behavior::AIB_FOLLOW_PATH) || (behavior == ai_behavior::AIB_STATION) || (behavior == ai_behavior::AIB_RUN_FROM))
#elif defined(DXX_BUILD_DESCENT_II)
if ((behavior == ai_behavior::AIB_SNIPE) || (behavior == ai_behavior::AIB_STATION) || (behavior == ai_behavior::AIB_RUN_FROM) || (behavior == ai_behavior::AIB_FOLLOW))
#endif
{
aip->hide_segment = hide_segment;
ailp->goal_segment = hide_segment;
aip->hide_index = -1; // This means the path has not yet been created.
aip->cur_path_index = 0;
}
aip->hide_segment = hide_segment;
ailp->goal_segment = hide_segment;
aip->hide_index = -1; // This means the path has not yet been created.
aip->cur_path_index = 0;
aip->SKIP_AI_COUNT = 0;