Merge pull request #3 from ckanibal/master

Relaunching now works with RelaunchRule
TheThow · Jul 7, 2017 · ebf8fcf · ebf8fcf
2 parents dd2b69c + c655d14
commit ebf8fcf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 48 deletions.
diff --git a/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_Knueppeln.c4s.ocs/Script.c b/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_Knueppeln.c4s.ocs/Script.c
@@ -50,25 +50,18 @@ func SpawnPlayer(int plr, prev_clonk)
 	//clonk->ChooseMenu();
 }
 
-// Gamecall from LastManStanding goal, on respawning.
-protected func OnPlayerRelaunch(int plr)
-{
-	var clonk = GetCrew(plr);
-	var relaunch = CreateObjectAbove(RelaunchContainer, LandscapeWidth() / 2, LandscapeHeight() / 2, clonk->GetOwner());
-	relaunch->StartRelaunch(clonk);
-
-	SpawnPlayer(plr);
-
-	return;
-}
-
 global func GetRandomSpawn()
 {
 	var spawns = [[80,190],[250,230],[360,230],[510,230],[660,230],[940,190]];
 	var rand = Random(GetLength(spawns));
 	return spawns[rand];
 }
 
+func OnClonkEnteredRelaunch(object clonk, int plr)
+{	
+	SpawnPlayer(plr);
+}
+
 func OnClonkLeftRelaunch(object clonk)
 {
 	var pos = GetRandomSpawn();

diff --git a/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_SkyCastle.c4s.ocs/Script.c b/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_SkyCastle.c4s.ocs/Script.c
@@ -64,25 +64,18 @@ func SpawnPlayer(int plr, prev_clonk)
 	//clonk->ChooseMenu();
 }
 
-// Gamecall from LastManStanding goal, on respawning.
-protected func OnPlayerRelaunch(int plr)
-{
-	var clonk = GetCrew(plr);
-	var relaunch = CreateObjectAbove(RelaunchContainer, LandscapeWidth() / 2, LandscapeHeight() / 2, clonk->GetOwner());
-	relaunch->StartRelaunch(clonk);
-
-	SpawnPlayer(plr);
-
-	return;
-}
-
 global func GetRandomSpawn()
 {
 	var spawns = [[660,300],[410,270],[180,315],[850,315],[820,405],[200,405],[410,395],[650,395]];
 	var rand = Random(GetLength(spawns));
 	return spawns[rand];
 }
 
+func OnClonkEnteredRelaunch(object clonk, int plr)
+{	
+	SpawnPlayer(plr);
+} 
+
 func OnClonkLeftRelaunch(object clonk)
 {
 	var pos = GetRandomSpawn();

diff --git a/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_Spaaaace.c4s.ocs/Script.c b/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_Spaaaace.c4s.ocs/Script.c
@@ -96,25 +96,19 @@ func SpawnPlayer(int plr, prev_clonk)
 	//clonk->ChooseMenu();
 }
 
-// Gamecall from LastManStanding goal, on respawning.
-protected func OnPlayerRelaunch(int plr)
-{
-	var clonk = GetCrew(plr);
-	var relaunch = CreateObjectAbove(RelaunchContainer, LandscapeWidth() / 2, LandscapeHeight() / 2, clonk->GetOwner());
-	relaunch->StartRelaunch(clonk);
-
-	SpawnPlayer(plr);
-
-	return;
-} 
-
 global func GetRandomSpawn()
 {
 	var spawns = [[490,605],[395,500],[585,500],[340,685],[625,685],[835,595]];
 	var rand = Random(GetLength(spawns));
 	return spawns[rand];
 }
 
+// see https://github.com/openclonk/openclonk/commit/c2f1d47f6301fa4488f1f479a419c7ae47a4eaf0
+func OnClonkEnteredRelaunch(object clonk, int plr)
+{	
+	SpawnPlayer(plr);
+} 
+
 func OnClonkLeftRelaunch(object clonk)
 {
 	var pos = GetRandomSpawn();

diff --git a/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_ThunderousSkies.c4s.ocs/Script.c b/Knueppeln.c4f.ocf/Arenas.c4f.ocf/DM_ThunderousSkies.c4s.ocs/Script.c
@@ -154,18 +154,6 @@ func SpawnPlayer(int plr, prev_clonk)
 	//clonk->ChooseMenu();
 }
 
-// Gamecall from LastManStanding goal, on respawning.
-protected func OnPlayerRelaunch(int plr)
-{
-	var clonk = GetCrew(plr);
-	var relaunch = CreateObjectAbove(RelaunchContainer, LandscapeWidth() / 2, LandscapeHeight() / 2, clonk->GetOwner());
-	relaunch->StartRelaunch(clonk);
-
-	SpawnPlayer(plr);
-
-	return;
-}
-
 global func BlastFree(x, y, level, cause_plr, bla) 
 {
 	return false;
@@ -178,6 +166,11 @@ global func GetRandomSpawn()
 	return spawns[rand];
 }
 
+func OnClonkEnteredRelaunch(object clonk, int plr)
+{	
+	SpawnPlayer(plr);
+} 
+
 func OnClonkLeftRelaunch(object clonk)
 {
 	var pos = GetRandomSpawn();