Merge branch 'master' into portal_branches

1 files changed, 5 insertions, 7 deletions

diff --git a/crawl-ref/source/place-info.cc b/crawl-ref/source/place-info.cc
index efb08c2138..3c871413d4 100644
--- a/crawl-ref/source/place-info.cc
+++ b/crawl-ref/source/place-info.cc
@@ -7,11 +7,11 @@
 
 PlaceInfo::PlaceInfo()
     : branch((branch_type)-2), num_visits(0),
-      levels_seen(0), mon_kill_exp(0), mon_kill_exp_avail(0),
-      turns_total(0), turns_explore(0), turns_travel(0), turns_interlevel(0),
-      turns_resting(0), turns_other(0), elapsed_total(0),
-      elapsed_explore(0), elapsed_travel(0), elapsed_interlevel(0),
-      elapsed_resting(0), elapsed_other(0)
+      levels_seen(0), mon_kill_exp(0), turns_total(0), turns_explore(0),
+      turns_travel(0), turns_interlevel(0), turns_resting(0),
+      turns_other(0), elapsed_total(0), elapsed_explore(0),
+      elapsed_travel(0), elapsed_interlevel(0), elapsed_resting(0),
+      elapsed_other(0)
 {
     for (int i = 0; i < KC_NCATEGORIES; i++)
         mon_kill_num[i] = 0;
@@ -57,7 +57,6 @@ const PlaceInfo &PlaceInfo::operator += (const PlaceInfo &other)
     levels_seen += other.levels_seen;
 
     mon_kill_exp       += other.mon_kill_exp;
-    mon_kill_exp_avail += other.mon_kill_exp_avail;
 
     for (int i = 0; i < KC_NCATEGORIES; i++)
         mon_kill_num[i] += other.mon_kill_num[i];
@@ -85,7 +84,6 @@ const PlaceInfo &PlaceInfo::operator -= (const PlaceInfo &other)
     levels_seen -= other.levels_seen;
 
     mon_kill_exp       -= other.mon_kill_exp;
-    mon_kill_exp_avail -= other.mon_kill_exp_avail;
 
     for (int i = 0; i < KC_NCATEGORIES; i++)
         mon_kill_num[i] -= other.mon_kill_num[i];