From bc204403baaabac1e2fe737d72637f531d323896 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 4 Dec 2015 03:36:31 +0000 Subject: [PATCH] Remove write-only variable Ai_initialized --- common/main/ai.h | 1 - similar/main/ai.cpp | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/main/ai.h b/common/main/ai.h index 3e2b53021..2833ff5ae 100644 --- a/common/main/ai.h +++ b/common/main/ai.h @@ -228,7 +228,6 @@ void init_ai_for_ship(void); // It is not valid to use FrameTime because robots do not get moved every frame. // --------- John: These variables must be saved as part of gamesave. --------- -extern int Ai_initialized; extern int Overall_agitation; extern fix Boss_teleport_interval; extern fix Boss_cloak_interval; // Time between cloaks diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index b16781ecc..581da551b 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -146,7 +146,6 @@ boss_teleport_segment_array_t Boss_teleport_segs; boss_gate_segment_array_t Boss_gate_segs; // ---------- John: These variables must be saved as part of gamesave. -------- -int Ai_initialized = 0; int Overall_agitation; point_seg_array_t Point_segs; point_seg_array_t::iterator Point_segs_free_ptr; @@ -500,8 +499,6 @@ void init_ai_objects(void) Boss_dying_sound_playing = 0; Boss_dying = 0; - Ai_initialized = 1; - init_boss_segments(Boss_gate_segs, 0, 0); init_boss_segments(Boss_teleport_segs, 1, 0); @@ -4455,6 +4452,7 @@ int ai_save_state(PHYSFS_file *fp) { fix tmptime32 = 0; + const int Ai_initialized = 0; PHYSFS_write(fp, &Ai_initialized, sizeof(int), 1); PHYSFS_write(fp, &Overall_agitation, sizeof(int), 1); range_for (auto &i, Objects) @@ -4637,7 +4635,7 @@ int ai_restore_state(PHYSFS_file *fp, int version, int swap) { fix tmptime32 = 0; - Ai_initialized = PHYSFSX_readSXE32(fp, swap); + PHYSFSX_readSXE32(fp, swap); Overall_agitation = PHYSFSX_readSXE32(fp, swap); range_for (object &obj, Objects) ai_local_read_swap(&obj.ctype.ai_info.ail, swap, fp);