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

fix attachment of basement to tall structures

stable-6.1
Maikel de Vries 2015-04-07 19:04:21 +02:00
parent 807ba20922
commit ea2799fa28
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionPreviewer.ocd/Script.c
View File

@ -98,15 +98,18 @@ func Reposition(int x, int y)
var found = false;
if (structure->~ConstructionCombineWith())
{
var stick_dir = structure->~ConstructionCombineDirection();
var find_rect = Find_InRect(AbsX(clonk->GetX() + x - dimension_x/2 - 10), AbsY(clonk->GetY() + y - dimension_y/2 - 10), dimension_x + 20, dimension_y + 20);
if ((stick_dir & CONSTRUCTION_STICK_Bottom))
find_rect = Find_AtPoint(AbsX(clonk->GetX() + x), AbsY(clonk->GetY() + y));
var other = FindObject(Find_Func(structure->ConstructionCombineWith(), this),
Find_InRect(AbsX(clonk->GetX() + x - dimension_x/2 - 10), AbsY(clonk->GetY() + y - dimension_y/2 - 10), dimension_x + 20, dimension_y + 20),
find_rect,
Find_OCF(OCF_Fullcon),
Find_Layer(clonk->GetObjectLayer()),
Find_Allied(clonk->GetOwner()),
Find_NoContainer());
if (other)
{
var stick_dir = structure->~ConstructionCombineDirection();
x = other->GetX();
y = other->GetY();
// Combine to different directions.