From 4f76484a66b44c31a4ff2424545ed64617d99b94 Mon Sep 17 00:00:00 2001
From: zhaop
Date: Fri, 19 Aug 2016 01:18:38 +0200
Subject: [PATCH] FIX: Enlarging the map crashes if stops exist near certain
 locations

---
 simworld.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/simworld.cc b/simworld.cc
index f9f2f34..de73287 100644
--- a/simworld.cc
+++ b/simworld.cc
@@ -2174,8 +2174,8 @@ void karte_t::enlarge_map(settings_t const* sets, sint8 const* const h_field)
 					// update halt
 					halthandle_t h = pl->get_boden_bei(i)->get_halt();
 					if(  h.is_bound()  ) {
-						for(  sint16 xp=max(0,x-cov);  xp<x+cov+1;  xp++  ) {
-							for(  sint16 yp=y;  yp<y+cov+1;  yp++  ) {
+						for(  sint16 xp=max(0,x-cov);  xp<min(new_groesse_x,x+cov+1);  xp++  ) {
+							for(  sint16 yp=y;  yp<min(new_groesse_y,y+cov+1);  yp++  ) {
 								access_nocheck(xp,yp)->add_to_haltlist(h);
 							}
 						}
@@ -2199,8 +2199,8 @@ void karte_t::enlarge_map(settings_t const* sets, sint8 const* const h_field)
 					// update halt
 					halthandle_t h = pl->get_boden_bei(i)->get_halt();
 					if(  h.is_bound()  ) {
-						for(  sint16 xp=x;  xp<x+cov+1;  xp++  ) {
-							for(  sint16 yp=max(0,y-cov);  yp<y+cov+1;  yp++  ) {
+						for(  sint16 xp=x;  xp<min(new_groesse_x,x+cov+1);  xp++  ) {
+							for(  sint16 yp=max(0,y-cov);  yp<min(new_groesse_y,y+cov+1);  yp++  ) {
 								access_nocheck(xp,yp)->add_to_haltlist(h);
 							}
 						}
--