From 4b845c91dd3ac50823da1087b2d195d76eb0f9fa Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Mon, 8 Jun 2015 14:47:16 -0400
Subject: [PATCH] Tweak placement of rectangles in terrain view

---
 src/classes/outdoors.cpp       | 20 --------------------
 src/scenedit/scen.graphics.cpp |  3 +++
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/classes/outdoors.cpp b/src/classes/outdoors.cpp
index e78729b5..8e286cc4 100644
--- a/src/classes/outdoors.cpp
+++ b/src/classes/outdoors.cpp
@@ -89,26 +89,6 @@ void cOutdoors::append(legacy::outdoor_record_type& old){
 		info_rect[i].right = old.info_rect[i].right;
 	}
 	for(i = 0; i < 4; i++){
-//		for(j = 0; j < 7; j++){
-//			wandering[i].monst[j] = old.wandering[i].monst[j];
-//			special_enc[i].monst[j] = old.special_enc[i].monst[j];
-//		}
-//		for(j = 0; j < 3; j++){
-//			wandering[i].fristd::endly[j] = old.wandering[i].fristd::endly[j];
-//			special_enc[i].fristd::endly[j] = old.special_enc[i].fristd::endly[j];
-//		}
-//		wandering[i].spec_on_meet = old.wandering[i].spec_on_meet;
-//		special_enc[i].spec_on_meet = old.special_enc[i].spec_on_meet;
-//		wandering[i].spec_on_win = old.wandering[i].spec_on_win;
-//		special_enc[i].spec_on_win = old.special_enc[i].spec_on_win;
-//		wandering[i].spec_on_flee = old.wandering[i].spec_on_flee;
-//		special_enc[i].spec_on_flee = old.special_enc[i].spec_on_flee;
-//		wandering[i].cant_flee = old.wandering[i].cant_flee;
-//		special_enc[i].cant_flee = old.special_enc[i].cant_flee;
-//		wandering[i].end_spec1 = old.wandering[i].end_spec1;
-//		special_enc[i].end_spec1 = old.special_enc[i].end_spec1;
-//		wandering[i].end_spec2 = old.wandering[i].end_spec2;
-//		special_enc[i].end_spec2 = old.special_enc[i].end_spec2;
 		wandering[i].append(old.wandering[i]);
 		special_enc[i].append(old.special_enc[i]);
 		wandering_locs[i].x = old.wandering_locs[i].x;
diff --git a/src/scenedit/scen.graphics.cpp b/src/scenedit/scen.graphics.cpp
index 3f29dc64..d3133dbb 100644
--- a/src/scenedit/scen.graphics.cpp
+++ b/src/scenedit/scen.graphics.cpp
@@ -941,6 +941,7 @@ void draw_terrain(){
 					draw_rect.right = 22 + 28 * (town->room_rect[i].right - cen_x + 4);
 					draw_rect.top = 24 + 36 * (town->room_rect[i].top - cen_y + 4);
 					draw_rect.bottom = 24 + 36 * (town->room_rect[i].bottom - cen_y + 4);
+					draw_rect.inset(-10, -13);
 					frame_rect(ter_draw_gworld, draw_rect, sf::Color::Red);
 				}
 			// draw border rect
@@ -948,6 +949,7 @@ void draw_terrain(){
 			draw_rect.right = 21 + 28 * (town->in_town_rect.right - cen_x + 4);
 			draw_rect.top = 25 + 36 * (town->in_town_rect.top - cen_y + 4);
 			draw_rect.bottom = 25 + 36 * (town->in_town_rect.bottom - cen_y + 4);
+			draw_rect.inset(10, 13);
 			frame_rect(ter_draw_gworld, draw_rect, sf::Color::White);
 		}
 		if(!editing_town) {
@@ -958,6 +960,7 @@ void draw_terrain(){
 					draw_rect.right = 22 + 28 * (current_terrain->info_rect[i].right - cen_x + 4);
 					draw_rect.top = 24 + 36 * (current_terrain->info_rect[i].top - cen_y + 4);
 					draw_rect.bottom = 24 + 36 * (current_terrain->info_rect[i].bottom - cen_y + 4);
+					draw_rect.inset(-10, -13);
 					frame_rect(ter_draw_gworld, draw_rect, sf::Color::Red);
 				}
 		}