From c2cd58d561a85d6b71c2accda46d1ef491ff32e9 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 14 Jun 2010 07:18:01 +0200
Subject: [PATCH] Fix recon and satellite to write spy plane bmap updates to
 disk

satdisp_sect() updated the in-memory bmap, but failed to write the
updates to disk.  Its callers already update bmap from other sources,
so move this update there, and connect it to the existing write back.
---
 src/lib/subs/aircombat.c | 13 ++++---------
 src/lib/subs/satmap.c    |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 6598457f..5942f4a8 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -148,17 +148,12 @@ ac_encounter(struct emp_qelem *bomb_list, struct emp_qelem *esc_list,
 		    plane_sweep(bomb_list, x, y);
 		if (flags & P_A)
 		    plane_sona(bomb_list, x, y, &head);
-		changed += map_set(player->cnum,
-				   sect.sct_x, sect.sct_y,
-				   dchr[sect.sct_type].d_mnem, 0);
-	    } else if (flags & P_S) {
+	    } else if (flags & P_S)
 		satdisp_sect(&sect, flags & P_I ? 10 : 50);
-	    } else {
+	    else
 		look_at_sect(&sect, 25);
-		changed += map_set(player->cnum,
-				   sect.sct_x, sect.sct_y,
-				   dchr[sect.sct_type].d_mnem, 0);
-	    }
+	    changed += map_set(player->cnum, sect.sct_x, sect.sct_y,
+			       dchr[sect.sct_type].d_mnem, 0);
 	    if (flags & P_S)
 		satdisp_units(sect.sct_x, sect.sct_y);
 	    else {
diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index c8ca907e..002388c4 100644
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -121,6 +121,8 @@ satmap(int x, int y, int eff, int range, int flags, int type)
 	    if (flags & P_S) {
 		if (sect.sct_own && sect.sct_own != player->cnum) {
 		    satdisp_sect(&sect, (flags & P_I) ? 5 : 50);
+		    changed += map_set(player->cnum, sect.sct_x, sect.sct_y,
+				       dchr[sect.sct_type].d_mnem, 0);
 		    ++count;
 		    if (opt_HIDDEN)
 			setcont(player->cnum, sect.sct_own, FOUND_FLY);
@@ -272,8 +274,6 @@ satdisp_sect(struct sctstr *sp, int acc)
        roundintby(sp->sct_item[I_IRON], acc),
        roundintby(sp->sct_item[I_PETROL], acc),
        roundintby(sp->sct_item[I_FOOD], acc));
-    map_set(player->cnum, sp->sct_x, sp->sct_y, dchr[sp->sct_type].d_mnem,
-	    0);
 }
 
 void