diff --git a/planet/Worlds.ocf/IronPeak.ocs/Scenario.txt b/planet/Worlds.ocf/IronPeak.ocs/Scenario.txt index 09f5d252b..5107c9caf 100644 --- a/planet/Worlds.ocf/IronPeak.ocs/Scenario.txt +++ b/planet/Worlds.ocf/IronPeak.ocs/Scenario.txt @@ -6,7 +6,7 @@ Difficulty=20 [Definitions] Definition1=Objects.ocd -Definition2=Decoration.ocd/Misc.ocd/AltMaterials.ocd +Definition2=Decoration.ocd\Misc.ocd\AltMaterials.ocd [Player1] Crew=Clonk=2 diff --git a/planet/Worlds.ocf/IronPeak.ocs/Script.c b/planet/Worlds.ocf/IronPeak.ocs/Script.c index 4fad42667..17be16075 100644 --- a/planet/Worlds.ocf/IronPeak.ocs/Script.c +++ b/planet/Worlds.ocf/IronPeak.ocs/Script.c @@ -173,7 +173,7 @@ global func FxSnowStormStart(object target, proplist effect) // Always a strong wind, either to the left or the right. effect.wind = (2 * Random(2) - 1) * (90 + Random(10)); // Accordingly a stormy sound. - Sound("WindLoop.ogg", true, 80, nil, 1); + Sound("WindLoop.ogg", true, 50, nil, 1); return 1; } diff --git a/planet/Worlds.ocf/IronPeak.ocs/System.ocg/SeqIntro.c b/planet/Worlds.ocf/IronPeak.ocs/System.ocg/SeqIntro.c index 59d058b86..09ef7af83 100644 --- a/planet/Worlds.ocf/IronPeak.ocs/System.ocg/SeqIntro.c +++ b/planet/Worlds.ocf/IronPeak.ocs/System.ocg/SeqIntro.c @@ -2,7 +2,7 @@ #appendto Sequence -public func Intro_Start() +public func Intro_Init() { // Create an airplane with pilot and fly it towards the peak. this.airplane = CreateObject(Plane, 24, LandscapeHeight() - 480); @@ -18,23 +18,27 @@ public func Intro_Start() this.airplane->SetXDir(12); this.airplane->SetYDir(-10); this.airplane->MakeInvincible(); - - // Move crew into airplane. - for (var i = 0; i < GetPlayerCount(C4PT_User); ++i) + return; +} + +public func Intro_Start() +{ + return ScheduleNext(4); +} + +public func Intro_JoinPlayer(int plr) +{ + var j = 0, crew; + while (crew = GetCrew(plr, j++)) { - var plr = GetPlayerByIndex(i, C4PT_User); - var j = 0, crew; - while (crew = GetCrew(plr, j++)) - { - crew->Enter(this.airplane); - crew->SetAction("Walk"); - } + crew->Enter(this.airplane); + crew->SetAction("Walk"); } // Reduce zoom SetPlayerZoomByViewRange(NO_OWNER, 300, nil, PLRZOOM_Set | PLRZOOM_LimitMax); SetViewTarget(this.pilot); - return ScheduleNext(4); + return; } public func Intro_1()