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

Remove write-only Escort_kill_object

Browse source 
Parallax never implemented Escort_kill_object because it was considered
too much work.  Remove the write-only vestiges of that feature.
This commit is contained in:
Kp 2017-09-26 04:15:50 +00:00
parent bba7e3a153
commit d7e97ca299
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/main/ai.h
View file

@ -232,7 +232,6 @@ extern objnum_t Escort_goal_index;
#define THIEF_PROBABILITY 16384 // 50% chance of stealing an item at each attempt
extern int Escort_kill_object;
// Maximum number kept track of, will keep stealing, causes stolen weapons to be lost!
struct stolen_items_t : public array<uint8_t, 10> {};
extern stolen_items_t Stolen_items;

3
d2x-rebirth/main/escort.cpp
View file

@ -110,7 +110,6 @@ constexpr array<char[12], ESCORT_GOAL_MARKER9> Escort_goal_text = {{
}};
static int Max_escort_length = 200;
int Escort_kill_object = -1;
stolen_items_t Stolen_items;
int Stolen_item_index;
fix64 Escort_last_path_created = 0;
@ -744,8 +743,6 @@ static void escort_create_path_to_goal(const vmobjptridx_t objp, const player_in
if (Escort_special_goal != ESCORT_GOAL_UNSPECIFIED)
Escort_goal_object = Escort_special_goal;
Escort_kill_object = -1;
const auto powerup_flags = player_info.powerup_flags;
if (Looking_for_marker != -1) {
goal_seg = escort_get_goal_segment(objp, OBJ_MARKER, Escort_goal_object - ESCORT_GOAL_MARKER1, powerup_flags);

6
similar/main/ai.cpp
View file

@ -521,7 +521,6 @@ void init_ai_object(vmobjptridx_t objp, ai_behavior behavior, const imsegidx_t h
#if defined(DXX_BUILD_DESCENT_II)
if (robot_is_companion(robptr)) {
ailp->mode = ai_mode::AIM_GOTO_PLAYER;
Escort_kill_object = -1;
}
if (robot_is_thief(robptr)) {
@ -4494,7 +4493,7 @@ int ai_save_state(PHYSFS_File *fp)
else
tmptime32 = Boss_hit_time - GameTime64;
PHYSFS_write(fp, &tmptime32, sizeof(fix), 1);
PHYSFS_write(fp, &Escort_kill_object, sizeof(Escort_kill_object), 1);
PHYSFS_writeSLE32(fp, -1);
if (Escort_last_path_created - GameTime64 < F1_0*(-18000))
tmptime32 = F1_0*(-18000);
else
@ -4691,7 +4690,7 @@ int ai_restore_state(PHYSFS_File *fp, int version, int swap)
Boss_hit_time = static_cast<fix64>(tmptime32);
if (version >= 8) {
Escort_kill_object = PHYSFSX_readSXE32(fp, swap);
PHYSFSX_readSXE32(fp, swap);
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Escort_last_path_created = static_cast<fix64>(tmptime32);
Escort_goal_object = static_cast<escort_goal_t>(PHYSFSX_readSXE32(fp, swap));
@ -4699,7 +4698,6 @@ int ai_restore_state(PHYSFS_File *fp, int version, int swap)
Escort_goal_index = PHYSFSX_readSXE32(fp, swap);
PHYSFS_read(fp, &Stolen_items, sizeof(Stolen_items[0]) * Stolen_items.size(), 1);
} else {
Escort_kill_object = -1;
Escort_last_path_created = 0;
Escort_goal_object = ESCORT_GOAL_UNSPECIFIED;
Escort_special_goal = ESCORT_GOAL_UNSPECIFIED;