FIX: Public player cannot replace wayobjs of other players

Fix the behaiour to match the one for ways.
Normal players were already allowed to replace wayobjs belonging to the public player.

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

Author: ceeac

simutrans/history.txt

@@ -13,6 +13,7 @@
 	FIX: multitile city building totally renovated, 3x faster city growth (at the start of the map in debug mode)
 	ADD: (mostly Yona-TYT) flowtext recognised img tag. For now only tags "#?XXX" are supported, where ? is one of these letter GSDTW and XXX a number. G is a general tool icon, S and simple tool, D is dialog tool, T a toolbar and W and window gadget.
 	CHG: default signal spacing for dragiing to 5 (as 4 and smaller can slow down trains faster than 200 km/h)
+	FIX: Public player cannot replace wayobjs of other players
 
 
 Release of 124.3.1 (r11671 on 5-Apr-2025):

src/simutrans/obj/wayobj.cc

@@ -361,15 +361,16 @@ void wayobj_t::calc_image()
 
 /* better use this constrcutor for new wayobj; it will extend a matching obj or make an new one
  */
-void wayobj_t::extend_wayobj(koord3d pos, player_t *owner, ribi_t::ribi dir, const way_obj_desc_t *desc, bool keep_existing_faster_way)
+void wayobj_t::extend_wayobj(koord3d pos, player_t *new_owner, ribi_t::ribi dir, const way_obj_desc_t *desc, bool keep_existing_faster_way)
 {
 	grund_t *gr=welt->lookup(pos);
 	if(gr) {
 		wayobj_t *existing_wayobj = gr->get_wayobj( desc->get_wtyp() );
 		if( existing_wayobj ) {
-			if(  ( existing_wayobj->get_desc()->get_topspeed() < desc->get_topspeed()  ||  !keep_existing_faster_way)  &&  player_t::check_owner(owner, existing_wayobj->get_owner())
-				&&  existing_wayobj->get_desc() != desc  )
-			{
+			const bool is_speed_ok = existing_wayobj->get_desc()->get_topspeed() < desc->get_topspeed() || !keep_existing_faster_way;
+			const bool is_owner_ok = player_t::check_owner(new_owner, existing_wayobj->get_owner()) || new_owner == welt->get_public_player();
+
+			if(  is_speed_ok  &&  is_owner_ok &&  existing_wayobj->get_desc() != desc) {
 				// replace slower by faster if desired
 				dir = dir | existing_wayobj->get_dir();
 				gr->set_flag(grund_t::dirty);
@@ -386,13 +387,13 @@ void wayobj_t::extend_wayobj(koord3d pos, player_t *owner, ribi_t::ribi dir, con
 		}
 
 		// nothing found => make a new one
-		wayobj_t *wo = new wayobj_t(pos,owner,dir,desc);
+		wayobj_t *wo = new wayobj_t(pos,new_owner,dir,desc);
 		gr->obj_add(wo);
 		wo->finish_rd();
 		wo->calc_image();
 		wo->mark_image_dirty( wo->get_front_image(), 0 );
 		wo->set_flag(obj_t::dirty);
-		player_t::book_construction_costs( owner,  -desc->get_price(), pos.get_2d(), desc->get_wtyp());
+		player_t::book_construction_costs( new_owner,  -desc->get_price(), pos.get_2d(), desc->get_wtyp());
 
 		for( uint8 i = 0; i < 4; i++ ) {
 		// Extend wayobjects around the new one, that aren't already connected.

tests/all_tests.nut

@@ -233,5 +233,6 @@ all_tests <- [
 	test_wayobj_build_straight,
 	test_wayobj_build_disconnected,
 	test_wayobj_upgrade_downgrade,
+	test_wayobj_upgrade_change_owner,
 	test_wayobj_electrify_depot
 ]

tests/tests/test_wayobj.nut

@@ -234,6 +234,55 @@ function test_wayobj_upgrade_downgrade()
 }
 
 
+function test_wayobj_upgrade_change_owner()
+{
+	local pl = player_x(0)
+	local public_pl = player_x(1)
+
+	local wobj_remover = command_x(tool_remove_wayobj)
+	local rail = way_desc_x.get_available_ways(wt_rail, st_flat)[0]
+	local catenaries = wayobj_desc_x.get_available_wayobjs(wt_rail).filter(@(idx, wobj) wobj.is_overhead_line())
+	catenaries.sort(@(a, b) a.get_topspeed() <=> b.get_topspeed())
+
+	// FIXME need at least 2 catenaries
+	ASSERT_TRUE(catenaries.len() >= 1)
+	local slow_cat = catenaries[0]
+	local fast_cat = catenaries[1]
+
+	ASSERT_EQUAL(command_x.build_way(pl, coord3d(3, 4, 0), coord3d(5, 4, 0), rail, true), null)
+
+	// public player: replace catenary of normal player
+	{
+		local builder = command_x(tool_build_wayobj)
+
+		ASSERT_EQUAL(command_x.build_wayobj(pl,        coord3d(3, 4, 0), coord3d(5, 4, 0), slow_cat), null)
+		ASSERT_EQUAL(command_x.build_wayobj(public_pl, coord3d(3, 4, 0), coord3d(5, 4, 0), fast_cat), null)
+
+		ASSERT_TRUE(tile_x(3, 4, 0).find_object(mo_wayobj).get_desc().is_equal(fast_cat))
+		ASSERT_EQUAL(tile_x(3, 4, 0).find_object(mo_wayobj).get_owner().get_name(), public_pl.get_name())
+
+		ASSERT_EQUAL(wobj_remover.work(public_pl, coord3d(3, 4, 0), coord3d(5, 4, 0), "" + wt_rail), null)
+	}
+
+	// normal player: replace caterary of public player
+	{
+		local builder = command_x(tool_build_wayobj)
+
+		ASSERT_EQUAL(command_x.build_wayobj(public_pl,  coord3d(3, 4, 0), coord3d(5, 4, 0), slow_cat), null)
+		ASSERT_EQUAL(command_x.build_wayobj(pl,         coord3d(3, 4, 0), coord3d(5, 4, 0), fast_cat), null)
+
+		ASSERT_TRUE(tile_x(3, 4, 0).find_object(mo_wayobj).get_desc().is_equal(fast_cat))
+		ASSERT_EQUAL(tile_x(3, 4, 0).find_object(mo_wayobj).get_owner().get_name(), pl.get_name())
+
+		ASSERT_EQUAL(wobj_remover.work(pl, coord3d(3, 4, 0), coord3d(5, 4, 0), "" + wt_rail), null)
+	}
+
+	// clean up
+	ASSERT_EQUAL(command_x(tool_remove_way).work(pl, coord3d(3, 4, 0), coord3d(5, 4, 0), "" + wt_rail), null)
+	RESET_ALL_PLAYER_FUNDS()
+}
+
+
 function test_wayobj_electrify_depot()
 {
 	local pl = player_x(0)