From ba132834257e13cadb7966ebea82f5f388a930e8 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Mon, 18 Jun 2018 11:59:47 -0400
Subject: [PATCH] tfv: make min y value on map configurable

---
 gr-sim/tfv/tfv_mapinfo.h  | 22 +++++++++++-----------
 gr-sim/tfv/tfv_worldmap.c |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index c4c77987..b2ba4792 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -75,7 +75,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=GRASSLAND,
 		.e_exit=NORTH_MOUNTAIN,
 		.w_exit=PINE_BEACH,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_GRASSLAND,
 		.background_image=landing_rle,
 	},
@@ -86,7 +86,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=MORIA,
 		.e_exit=NORTH_FOREST,
 		.w_exit=LANDING_SITE,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_MOUNTAIN,
 		.background_image=NULL,
 	},
@@ -97,7 +97,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=SOUTH_FOREST,
 		.e_exit=NOEXIT,
 		.w_exit=NORTH_MOUNTAIN,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_FOREST|LAND_RIGHT_BEACH,
 		.background_image=NULL,
 	},
@@ -108,7 +108,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=SOUTH_BEACH,
 		.e_exit=GRASSLAND,
 		.w_exit=NOEXIT,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_LEFT_BEACH,
 		.background_image=NULL,
 	},
@@ -119,7 +119,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=CACTUS_RANCH,
 		.e_exit=MORIA,
 		.w_exit=PALM_BEACH,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_GRASSLAND,
 		.background_image=NULL,
 	},
@@ -130,7 +130,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=COLLEGE_PARK,
 		.e_exit=SOUTH_FOREST,
 		.w_exit=GRASSLAND,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_MOUNTAIN,
 		.background_image=NULL,
 	},
@@ -141,7 +141,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=OCEAN_CITY,
 		.e_exit=NOEXIT,
 		.w_exit=MORIA,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_FOREST|LAND_RIGHT_BEACH,
 		.background_image=NULL,
 	},
@@ -152,7 +152,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=NOEXIT,
 		.e_exit=CACTUS_RANCH,
 		.w_exit=NOEXIT,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_LEFT_BEACH|LAND_SOUTHSHORE,
 		.background_image=NULL,
 	},
@@ -163,7 +163,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=NOEXIT,
 		.e_exit=COLLEGE_PARK,
 		.w_exit=SOUTH_BEACH,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_GRASSLAND|LAND_SOUTHSHORE,
 		.background_image=NULL,
 	},
@@ -174,7 +174,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=NOEXIT,
 		.e_exit=OCEAN_CITY,
 		.w_exit=CACTUS_RANCH,
-		.miny=0,
+		.miny=4,
 		.background_image=collegep_rle,
 	},
 	{
@@ -184,7 +184,7 @@ struct map_info_type map_info[16] = {
 		.s_exit=NOEXIT,
 		.e_exit=NOEXIT,
 		.w_exit=COLLEGE_PARK,
-		.miny=0,
+		.miny=4,
 		.land_type=LAND_RIGHT_BEACH|LAND_SOUTHSHORE,
 		.background_image=NULL,
 	},
diff --git a/gr-sim/tfv/tfv_worldmap.c b/gr-sim/tfv/tfv_worldmap.c
index 80da2a6a..2baf8935 100644
--- a/gr-sim/tfv/tfv_worldmap.c
+++ b/gr-sim/tfv/tfv_worldmap.c
@@ -234,7 +234,7 @@ int world_map(void) {
 					refresh=1;
 				}
 			}
-			else if (newy<4) {
+			else if (newy<map_info[map_location].miny) {
 				if (map_info[map_location].n_exit!=NOEXIT) {
 					map_location=map_info[map_location].n_exit;
 					tfv_y=28;