From 449bf4f45ae78a3304ffa9188bfeeab25dd07db1 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Fri, 27 Sep 2019 13:36:03 +0200 Subject: [PATCH] Remove two unused members of class monster (#34265) * Remove unused member monster::last_baby It's actually never read. * Remove unused member monster::last_biosig It's actually never read. --- src/game.cpp | 4 ---- src/monster.cpp | 2 -- src/monster.h | 2 -- src/savegame_json.cpp | 4 ---- 4 files changed, 12 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index bd70a01f016e4..6b61b6f926814 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -4675,10 +4675,6 @@ bool game::add_zombie( monster &critter, bool pin_upgrade ) } critter.last_updated = calendar::turn; - // @todo change last_baby to time_point - critter.last_baby = to_turn( calendar::turn ); - // @todo change last_biosig to time_point - critter.last_biosig = to_turn( calendar::turn ); return critter_tracker->add( critter ); } diff --git a/src/monster.cpp b/src/monster.cpp index 5bf7056d9b5fc..6a2c59f127861 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -210,9 +210,7 @@ monster::monster() upgrades = false; upgrade_time = -1; last_updated = 0; - last_baby = 0; biosig_timer = -1; - last_biosig = 0; } monster::monster( const mtype_id &id ) : monster() diff --git a/src/monster.h b/src/monster.h index cfde96dff8362..976740402d4de 100644 --- a/src/monster.h +++ b/src/monster.h @@ -484,8 +484,6 @@ class monster : public Creature void init_from_item( const item &itm ); time_point last_updated = calendar::turn_zero; - int last_baby; - int last_biosig; /** * Do some cleanup and caching as monster is being unloaded from map. */ diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index c7fee7e97613a..aa59cca6c39b2 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -1832,8 +1832,6 @@ void monster::load( JsonObject &data ) if( !data.read( "last_updated", last_updated ) ) { last_updated = calendar::turn; } - last_baby = data.get_int( "last_baby", to_turn( calendar::turn ) ); - last_biosig = data.get_int( "last_biosig", to_turn( calendar::turn ) ); data.read( "mounted_player_id", mounted_player_id ); data.read( "path", path ); } @@ -1885,10 +1883,8 @@ void monster::store( JsonOut &json ) const json.member( "last_updated", last_updated ); json.member( "reproduces", reproduces ); json.member( "baby_timer", baby_timer ); - json.member( "last_baby", last_baby ); json.member( "biosignatures", biosignatures ); json.member( "biosig_timer", biosig_timer ); - json.member( "last_biosig", last_biosig ); json.member( "summon_time_limit", summon_time_limit );