FIX: Do not change underground mode when scrolling from the minimap

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11635 8aca7d54-2c30-db11-9de9-000461428c89

Author: prissi

simutrans/history.txt

@@ -1,12 +1,13 @@
-	CHG: option for pakset dump versus all other debug by appending 'p' to the debug level, e.g. "-debug 0p" to show only pak details
+	CHG: option for pakset dump versus all other debug by appending 'p' to the debug level, e.g. "-debug 0p" to show only pak details to declutter server logs
 	CHG: tram system type way can be laid over other tracks as well (like pak192 narrowgauge over normal rails)
-	CHG: bridge builder is now only a two click tool (total reneval) Can not again connect to complex ramps on elevated ways or cross rivers automatically
+	CHG: bridge builder is now only a two click tool (total reneval) Can again connect to complex ramps on elevated ways or cross rivers automatically
 	FIX: Players gain money by building long stretches of expensive tunnels
 	FIX: Pak files cannot represent cost of vehicles exceeding 2^32-1 Simu-cents
 	FIX: Pak files cannot represent runningcost of vehicles exceeding 2^16-1 Simu-cents
 	FIX: Pak files cannot represent fixed cost of vehicles exceeding 2^32-1 Simu-cents
 	FIX: makro building with way order and stations extensions fixed
 	FIX: Freelist allocated objects (tiles, ways, trees etc.) use 3x more memory than necessary
+	FIX: Do not change underground mode when scrolling from the minimap
 
 
 Release of 124.3 (r11590 on 10-Jan-2025):

src/simutrans/display/viewport.cc

@@ -121,17 +121,18 @@ void viewport_t::switch_underground_mode(const koord3d& pos)
 
 // change the center viewport position for a certain ground tile
 // any possible convoi to follow will be disabled
-void viewport_t::change_world_position( const koord3d& new_ij )
+void viewport_t::change_world_position( const koord3d& new_ij, bool automatic_underground)
 {
 	follow_convoi = convoihandle_t();
-	switch_underground_mode(new_ij);
+	if (automatic_underground) {
+		switch_underground_mode(new_ij);
+	}
 	change_world_position( get_map2d_coord( new_ij ) );
 }
 
 
 void viewport_t::change_world_position(const koord3d& pos, const koord& off, scr_coord sc)
 {
-	switch_underground_mode(pos);
 	// see get_viewport_coord and update_cached_values
 	koord scr_pos_2d = pos.get_2d() - view_ij_off;
 

src/simutrans/display/viewport.h

@@ -174,7 +174,7 @@ class viewport_t
 	 * Set center viewport position, taking height into account.
 	 * Possibly switches underground mode.
 	 */
-	void change_world_position( const koord3d& ij );
+	void change_world_position( const koord3d& ij, bool automatic_underground = true );
 
 	/**
 	 * Set center viewport position, placing a in-game koord3d under the desired screen position.

src/simutrans/gui/minimap.cc

@@ -1194,7 +1194,7 @@ bool minimap_t::infowin_event(const event_t *ev)
 	if(IS_LEFTRELEASE(ev)  ||  ((IS_LEFTCLICK(ev)  ||  IS_LEFTDRAG(ev))  &&  !env_t::leftdrag_in_minimap)) {
 		world->get_viewport()->set_follow_convoi( convoihandle_t() );
 		const sint8 min_hgt = world->is_within_grid_limits(k) ? world->min_hgt(k) : 0;
-		world->get_viewport()->change_world_position(koord3d(k,min_hgt));
+		world->get_viewport()->change_world_position(koord3d(k,min_hgt),false); // change position bu do not touch underground mode
 		return true;
 	}