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

Rule_Relaunch: Fix positioning and inventory transfer; add option to prevent initial "relaunch" 

# Conflicts:
#	planet/Objects.ocd/Rules.ocd/Relaunch.ocd/Script.c
alut-include-path
Fulgen301 2017-04-22 19:35:23 +02:00
parent 7064d4f6fb
commit 7fed3ea1c0
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
planet/Objects.ocd/Rules.ocd/Relaunch.ocd/Script.c
View File

@ -171,18 +171,14 @@ public func InitializePlayer(int plr)
_inherited(plr, ...);
// Scenario script callback.
relaunches[plr] = default_relaunch_count;
GameCallEx("OnPlayerRelaunch", plr, false);
return DoRelaunch(plr, nil, nil, true);
if(!GameCallEx("OnPlayerRelaunch", plr, false)) return DoRelaunch(plr, nil, nil, true);
}
/*public func OnClonkDeath(int plr, object pClonk, int iKiller)
public func OnClonkDeath(object clonk, int killer)
{
return RelaunchPlayer(plr, iKiller, pClonk);
}*/
public func RelaunchPlayer(int plr, int killer, object clonk)
{
if(plr == nil || plr == NO_OWNER) return;
if(clonk == nil) return;
var plr = clonk->GetOwner();
if(plr == NO_OWNER || (!respawn_script_players && GetPlayerType(plr) == C4PT_Script)) return;
if(default_relaunch_count != nil)
{
@ -228,10 +224,10 @@ private func GetRelaunchBase(object clonk)
{
var plr = clonk->GetOwner();
// Neutral flagpoles are preferred respawn points, because they are used as the only respawn points in missions.
var base = clonk->FindObject2(Find_ID(Flagpole), Find_Func("IsNeutral"), clonk->Sort_Distance());
var base = clonk->FindObject(Find_ID(Flagpole), Find_Func("IsNeutral"), clonk->Sort_Distance());
// If there are no neutral flagpoles, find closest base owned by the player (or team) and try to buy a clonk.
if (!base)
base = clonk->FindObject2(Find_Func("IsBaseBuilding"), Find_Allied(plr), clonk->Sort_Distance());
base = clonk->FindObject(Find_Func("IsBaseBuilding"), Find_Allied(plr), clonk->Sort_Distance());
return base;
}
@ -321,7 +317,7 @@ protected func FindRelaunchPos(int plr)
// Succes.
return [tx, ty];
}
return nil;
return [];
}
/*-- Scenario saving --*/