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

correctly initialize script player in defense goal

alut-include-path
Maikel de Vries 2017-02-22 21:37:48 +01:00
parent 649d7bed0a
commit 5c8ed12c3f
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
planet/Objects.ocd/Goals.ocd/Defense.ocd/Script.c
View File

@ -46,7 +46,7 @@ public func Construction()
{key = "bonus", title = Icon_Wealth, sorted = true, desc = true, default = "0", priority = 100}
]);
// Create the enemy script player, the script player should be in the attackers team (id = 2).
CreateScriptPlayer("$PlayerAttackers$", nil, 2, CSPF_NoEliminationCheck);
CreateScriptPlayer("$PlayerAttackers$", nil, 2, CSPF_NoEliminationCheck | CSPF_NoScenarioInit | CSPF_NoScenarioSave, GetID());
return _inherited(...);
}
@ -55,15 +55,9 @@ public func Construction()
public func InitializePlayer(int plr)
{
// Init the enemy script player.
// The enemy script player is initialized in the function below.
if (GetPlayerType(plr) == C4PT_Script)
{
GetCrew(plr)->RemoveObject();
// Add an effect to control the waves and set enemy player.
fx_wave_control = CreateEffect(FxWaveControl, 100, nil, plr);
return;
}
// Init the normal players
var plrid = GetPlayerID(plr);
// Store active players.
@ -75,6 +69,21 @@ public func InitializePlayer(int plr)
return;
}
public func InitializeScriptPlayer(int plr)
{
// Forward to defense goal object.
if (this == Goal_Defense)
{
var goal = FindObject(Find_ID(Goal_Defense));
if (goal)
goal->InitializeScriptPlayer(plr);
return;
}
// Add an effect to control the waves and set enemy player.
fx_wave_control = CreateEffect(FxWaveControl, 100, nil, plr);
return;
}
public func RelaunchPlayer(int plr)
{
if (GetPlayerType(plr) == C4PT_User)