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

Fix suspicious_assignment warnings in Parkour

master
Nicolas Hake 2018-07-23 10:44:57 +02:00
parent c3ef039872
commit c4f47a6329
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
planet/Parkour.ocf/Maze.ocs/Script.c
View File

@ -23,13 +23,14 @@ func LaunchPlayer(int plr)
{
// Position and materials
var starting_cave = g_caves[0];
var i, crew, obj;
var i, crew;
for (i=0; crew=GetCrew(plr,i); ++i)
{
crew->SetPosition(starting_cave.X/2, starting_cave.Y-18);
for (var tool in [Pickaxe, GrappleBow, SprayCan])
{
if (obj = FindObject(Find_ID(tool), Find_Owner(plr), Find_NoContainer())) obj->RemoveObject();
var obj = FindObject(Find_ID(tool), Find_Owner(plr), Find_NoContainer());
if (obj) obj->RemoveObject();
crew->CreateContents(tool);
}
crew->CreateContents(Dynamite,2);

7
planet/Parkour.ocf/VolcanoEscapeEx.ocs/Script.c
View File

@ -65,13 +65,16 @@ func VolcanoTimer()
// Get volcano height
var y_volcano = g_volcano->GetLavaPeak();
// Get player progress
var y_plr, crew, n_crew;
var y_plr, n_crew;
for (var i=0; i<GetPlayerCount(C4PT_User); ++i)
if (crew = GetCursor(GetPlayerByIndex(i, C4PT_User)))
{
var crew = GetCursor(GetPlayerByIndex(i, C4PT_User));
if (crew)
{
y_plr += crew->GetY();
++n_crew;
}
}
if (n_crew) y_plr = y_plr / n_crew;
// Calc rubber band
var rubber_length = 85 * y_plr / LandscapeHeight() + 65;