From a28b3b9ca1a7e8920e8b4707fea480c5620d6922 Mon Sep 17 00:00:00 2001
From: Maikel de Vries <mdt.maikel@gmail.com>
Date: Fri, 30 Mar 2018 10:54:41 +0200
Subject: [PATCH] cable cars: fix network recreation when cable has broken

---
 .../Libraries.ocd/CableStation.ocd/Script.c   | 11 +++--
 planet/Tests.ocf/CableCars.ocs/Script.c       | 44 ++++++++++++++++---
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Libraries.ocd/CableStation.ocd/Script.c b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Libraries.ocd/CableStation.ocd/Script.c
index cb2324886..79449d4af 100644
--- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Libraries.ocd/CableStation.ocd/Script.c
+++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Libraries.ocd/CableStation.ocd/Script.c
@@ -185,8 +185,8 @@ public func AddCableConnection(object cable)
 	// Acquire destinations of the other crossing, all these are now in reach
 	AddCableDestinations(other_crossing->GetDestinations(), other_crossing);
 	// Send own destinations, now in reach for the other one
-	other_crossing->AddCableDestinations(GetDestinations(), this);
-	// Awesome, more power to the network!
+	other_crossing->AddCableDestinations(this->GetDestinations(), this);
+	// Destinations have been updated for this crossing.
 	DestinationsUpdated();
 	return true;
 }
@@ -384,8 +384,13 @@ public func RenewConnections()
 		var other_crossing = connection->~GetConnectedObject(this);
 		if (!other_crossing || !other_crossing->~IsCableCrossing())
 			continue;
-		PushBack(destination_list, [other_crossing, other_crossing, ObjectDistance(other_crossing)]);
+		// Acquire destinations of the other crossing, all these are now in reach
 		AddCableDestinations(other_crossing->GetDestinations(), other_crossing);
+		// Send own destinations, now in reach for the other one
+		other_crossing->AddCableDestinations(this->GetDestinations(), this);
+		// Destinations have been updated for this crossing.
+		DestinationsUpdated();
+		// Also update other connections.
 		other_crossing->RenewConnections();
 	}
 }
diff --git a/planet/Tests.ocf/CableCars.ocs/Script.c b/planet/Tests.ocf/CableCars.ocs/Script.c
index b472c6ead..a78685873 100644
--- a/planet/Tests.ocf/CableCars.ocs/Script.c
+++ b/planet/Tests.ocf/CableCars.ocs/Script.c
@@ -57,7 +57,7 @@ protected func InitializePlayer(int plr)
 	
 	// Add test control effect.
 	var fx = AddEffect("IntTestControl", nil, 100, 2);
-	fx.testnr = 7;
+	fx.testnr = 1;
 	fx.launched = false;
 	fx.plr = plr;
 	return;
@@ -416,7 +416,7 @@ global func Test5_OnFinished()
 
 global func Test6_OnStart(int plr)
 {
-	SetWindFixed(50);
+	SetWindFixed(80);
 	CreateObjectAbove(WindGenerator, 30, 160, plr);
 
 	var crossing1 = CreateObjectAbove(CableCrossing, 70, 160, plr);
@@ -546,8 +546,42 @@ global func Test7_OnFinished()
 
 global func Test8_OnStart(int plr)
 {
-	ClearFreeRect(0, 0, LandscapeWidth(), LandscapeHeight());
+	var crossing1 = CreateObjectAbove(CableCrossing, 20, 160, plr);
+	var crossing2 = CreateObjectAbove(CableCrossing, 40, 160, plr);
+	var crossing3 = CreateObjectAbove(CableCrossing, 60, 160, plr);
+	var crossing4 = CreateObjectAbove(CableCrossing, 80, 160, plr);
+	var crossing5 = CreateObjectAbove(CableCrossing, 100, 160, plr);
+	var crossing6 = CreateObjectAbove(CableCrossing, 120, 160, plr);
+	var crossing7 = CreateObjectAbove(CableCrossing, 140, 160, plr);
 	
+	CreateCableCrossingsConnection(crossing1, crossing2);
+	CreateCableCrossingsConnection(crossing2, crossing3);
+	CreateCableCrossingsConnection(crossing3, crossing4);
+	CreateCableCrossingsConnection(crossing4, crossing5);
+	CreateCableCrossingsConnection(crossing5, crossing6);
+	CreateCableCrossingsConnection(crossing5, crossing7);
+			
+	// Log what the test is about.
+	Log("Specific network for which the creation and distance measures fail.");
+	return true;
+}
+
+global func Test8_Completed()
+{
+	if (IsSymmetricCableCarNetwork())
+		return true;
+	return false;
+}
+
+global func Test8_OnFinished()
+{
+	RemoveTestObjects();
+	return;
+}
+
+
+global func Test9_OnStart(int plr)
+{
 	var nr_crossings = RandomX(6, 12);
 	var connect_chance = 20; // In percent.
 	var start_time = GetTime();
@@ -575,14 +609,14 @@ global func Test8_OnStart(int plr)
 	return true;
 }
 
-global func Test8_Completed()
+global func Test9_Completed()
 {
 	if (IsSymmetricCableCarNetwork())
 		return true;
 	return false;
 }
 
-global func Test8_OnFinished()
+global func Test9_OnFinished()
 {
 	RemoveTestObjects();
 	return;