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

improve moving objects out of basement on completion

stable-6.1
Maikel de Vries 2015-04-08 20:15:23 +02:00
parent cc9e0ea9f2
commit e9e6fd9dba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planet/Objects.ocd/Structures.ocd/Basement.ocd/Script.c
View File

@ -71,18 +71,18 @@ private func MoveOutOfBasement()
// Find all objects inside the basement which are stuck. // Find all objects inside the basement which are stuck.
var wdt = GetObjWidth(); var wdt = GetObjWidth();
var hgt = GetObjHeight(); var hgt = GetObjHeight();
var lying_around = FindObjects(Find_Or(Find_Category(C4D_Vehicle), Find_Category(C4D_Object), Find_Category(C4D_Living)), Find_InRect(-wdt / 2, -hgt / 2 - 2, wdt, hgt + 4)); var lying_around = FindObjects(Find_Or(Find_Category(C4D_Vehicle), Find_Category(C4D_Object), Find_Category(C4D_Living)), Find_InRect(-wdt / 2 - 1, -hgt / 2 - 2, wdt + 2, hgt + 4));
// Move up these objects. // Move up these objects.
for (var obj in lying_around) for (var obj in lying_around)
{ {
var x = obj->GetX(); var x = obj->GetX();
var y = obj->GetY(); var y = obj->GetY();
var dif = 0; var dif = 0;
// // Move up object until it is not stuck any more.
while (obj->Stuck() || obj->GetContact(-1, CNAT_Bottom)) while (obj->Stuck() || obj->GetContact(-1, CNAT_Bottom))
{ {
// Only up to 20 pixels. // Only up to 32 pixels.
if (dif > 20) if (dif > 32)
{ {
obj->SetPosition(x, y); obj->SetPosition(x, y);
break; break;