marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cable cars: fix network recreation when cable has broken

master
Maikel de Vries 2018-03-30 10:54:41 +02:00
parent d8736a56ac
commit a28b3b9ca1
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Libraries.ocd/CableStation.ocd/Script.c
View File

@ -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();
}
}

44
planet/Tests.ocf/CableCars.ocs/Script.c
View File

@ -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;